ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
16,119 Commits 2 Branches 0 Tags 54 MiB
7a287e8929
Commit Graph

16119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
c4b1220105 Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 
* changes:
  dead code removal
  Cap the number of notifications that a given package can post.
  Move the usb mass storage notification & activity into SystemUI.apk.
  Add some disabled logging and another test case for reapplying the notification views.
 2010-06-09 14:43:47 -07:00
Christopher Tate
e848d6eb0c am d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken 2010-06-09 12:26:38 -07:00
Christopher Tate
3c2967b345 Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken 2010-06-09 12:25:05 -07:00
The Android Open Source Project
5e1b2f531d merge from open-source master 
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
 2010-06-09 12:17:03 -07:00
The Android Open Source Project
0887ab4d10 merge from open-source master 
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
 2010-06-09 12:14:58 -07:00
James Dong
6a852f1343 am 457d5ae3: Fix a potential(observed sometimes) media server crash 2010-06-09 11:29:30 -07:00
Jean-Baptiste Queru
1e254923ea Merge "Adding mimetypes to the mimetype map used in the web view" 2010-06-09 10:51:16 -07:00
The Android Open Source Project
ae68e08411 ignore from open-source master 
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
 2010-06-09 09:21:39 -07:00
Jean-Baptiste Queru
64ba44a221 Merge "Fix for deadlock between StatusBarService and NotificationManagerService" 2010-06-09 07:28:50 -07:00
The Android Open Source Project
1e94155433 merge from open-source master 
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
 2010-06-09 07:14:36 -07:00
Mathias Agopian
2b6dd6deac am 55f8209d: Merge "allow re-targetting of surfaces" into kraken 2010-06-08 20:15:56 -07:00
Mathias Agopian
74b3237fa9 Merge "allow re-targetting of surfaces" into kraken 2010-06-08 20:14:11 -07:00
Mathias Agopian
579b3f88d0 allow re-targetting of surfaces 
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.

Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
 2010-06-08 20:10:02 -07:00
Jim Miller
c8bc7d3d59 am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:35:21 -07:00
Jim Miller
9cc61ca487 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
 2010-06-08 16:33:26 -07:00
Jim Miller
91874c12e2 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
 2010-06-08 16:33:22 -07:00
Jim Miller
5ca447aa0c Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:31:32 -07:00
Mathias Agopian
9a96cb5d5a am 1debc665: fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:47:37 -07:00
Jean-Baptiste Queru
2b4c33ff92 Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend" 2010-06-08 15:43:02 -07:00
Mathias Agopian
53503a97a9 fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:40:56 -07:00
The Android Open Source Project
57e32fb1ce merge from open-source master 
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
 2010-06-08 13:17:41 -07:00
James Dong
2aad8e68f0 am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:15:47 -07:00
James Dong
d13aa57bc4 Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:13:26 -07:00
Romain Guy
03d0be73c2 am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:02:14 -07:00
Romain Guy
002415834b am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
 2010-06-08 13:01:05 -07:00
Romain Guy
c18bdc969a am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
 2010-06-08 13:00:30 -07:00
Romain Guy
649329c3da Merge "Add a method to hide/show a SurfaceView's surface." into froyo 2010-06-08 12:59:36 -07:00
Brad Fitzpatrick
f05463b319 am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:38:52 -07:00
Brad Fitzpatrick
03540cdc9d Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:37:34 -07:00
James Dong
d945e3535a am dae9fd31: Initial check-in for collecting stats from authoring engine at runtime 2010-06-08 11:58:34 -07:00
Jean-Baptiste Queru
56d23925ed Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https." 2010-06-08 10:19:51 -07:00
James Dong
b74b6463a2 am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken 2010-06-08 10:15:33 -07:00
James Dong
0e90861ce2 Merge "Second part of speeding up video recording frame rate" into kraken 2010-06-08 10:14:26 -07:00
Andreas Huber
90af541554 am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 09:20:59 -07:00
Andreas Huber
f0cf1d7ef8 Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 09:19:07 -07:00
Jim Miller
944bf18fac am 700a9506: am cb52cb52: Fix SDK build. 2010-06-07 21:25:15 -07:00
Jim Miller
ca436aa5b4 am cb52cb52: Fix SDK build. 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
 2010-06-07 21:23:53 -07:00
Jim Miller
9ae0a98f37 am cb52cb52: Fix SDK build. 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into froyo-plus-aosp

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
 2010-06-07 21:23:33 -07:00
Jim Miller
77a885523c am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-07 19:28:08 -07:00
Jim Miller
4c58e3ac69 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
 2010-06-07 19:26:28 -07:00
Jim Miller
7d3eac2b0d am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
 2010-06-07 19:25:49 -07:00
Jim Miller
c354b89c76 Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-07 19:24:45 -07:00
Christopher Tate
7b2f655acb am 8a7fa44f: am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 2010-06-07 18:50:44 -07:00
Christopher Tate
f023c4ce5b am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp

* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
  Don't bring up Launcher until after boot complete
 2010-06-07 18:49:07 -07:00
Christopher Tate
ba34889611 am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken

* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
  Don't bring up Launcher until after boot complete
 2010-06-07 18:48:27 -07:00
Christopher Tate
e1855846a4 Merge "Don't bring up Launcher until after boot complete" into froyo 2010-06-07 18:46:46 -07:00
Dianne Hackborn
dbfef2a428 am 0bc0a46a: am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-07 18:34:10 -07:00
Dianne Hackborn
2484ce43dd am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp

* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
  Fix issue #2749322: addPackageToPreferred throws SecurityException
 2010-06-07 18:32:41 -07:00
Dianne Hackborn
dd4650da60 am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into kraken

* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
  Fix issue #2749322: addPackageToPreferred throws SecurityException
 2010-06-07 18:32:04 -07:00
Dianne Hackborn
73f8edb0d6 Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-07 17:32:02 -07:00