ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
17,149 Commits 2 Branches 0 Tags 54 MiB
6f19e9c1c2
Commit Graph

17149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
466770be8a am c62c4c8b: am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:05:31 -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
Kenny Root
b38f8ab247 Merge "Range checking for ResTable_map" 2010-06-08 12:52:57 -07:00
Kenny Root
615f5d64db Range checking for ResTable_map 
Correct previous offset change and get ready for safe-iop.

Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
 2010-06-08 12:51:49 -07:00
Brad Fitzpatrick
b105cb726b am 599f7287: am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:40:57 -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
4905c19c74 am 15c0c098: am dae9fd31: Initial check-in for collecting stats from authoring engine at runtime 2010-06-08 12:00:30 -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
Kenny Root
db82a72f5e Merge "Improve checking in aapt dump" 2010-06-08 10:29:17 -07:00
Kenny Root
61c22be593 Improve checking in aapt dump 
The aapt dump reading had less error checking than the actual parsing,
so this change brings it more into parity so that bad APKs don't crash
"aapt dump"

Change-Id: Ib30e63e41be5c652645c4aa0de580a87b184529d
 2010-06-08 10:28:19 -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
87597604ac am ef2ad683: am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken 2010-06-08 10:17:29 -07:00
Andreas Huber
a39d2fe886 am ae9348bc: am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 10:15:34 -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
Jim Miller
86f4f7a246 am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build. 2010-06-08 10:15:27 -07:00
Jim Miller
c9d6dde707 am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-08 10:15:21 -07:00
Christopher Tate
fd83c8d5e3 am 40c20b06: am 8a7fa44f: am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 2010-06-08 10:15:15 -07:00
Dianne Hackborn
0e2e35abf3 am fe2c0864: am 0bc0a46a: am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-08 10:15:06 -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
Robert Greenwalt
33da63257e Merge "resolved conflicts for merge of ee09dc67 to master" 2010-06-08 10:13:25 -07:00
Robert Greenwalt
43bba34d59 resolved conflicts for merge of ee09dc67 to master 
Change-Id: I8b0b595580d9c6d44b84e636012705dc913fa6ac
 2010-06-08 10:10:54 -07:00
Kenny Root
870b54f5c1 Merge "Include stdlib to fix sim build" 2010-06-08 09:34:39 -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
Ben Murdoch
cd85f9ae84 Merge "DumpRenderTree fix." 2010-06-08 02:46:21 -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
Robert Greenwalt
b245ecda7a am 7db534fa: am 5a671d03: Cut logging, boost efficiency of ThrottleService 2010-06-07 17:00:41 -07:00
Robert Greenwalt
c2d073a78e am 5a671d03: Cut logging, boost efficiency of ThrottleService 
Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into froyo-plus-aosp

* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
  Cut logging, boost efficiency of ThrottleService
 2010-06-07 16:59:23 -07:00
Robert Greenwalt
1229aeb5da am 5a671d03: Cut logging, boost efficiency of ThrottleService 
Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into kraken

* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
  Cut logging, boost efficiency of ThrottleService
 2010-06-07 16:59:01 -07:00
The Android Open Source Project
c75e10a738 am cefdedc3: merge from froyo-plus-aosp 2010-06-07 16:45:04 -07:00
The Android Open Source Project
d0e428b8a2 merge from froyo-plus-aosp 
Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e
 2010-06-07 16:42:09 -07:00
The Android Open Source Project
33f7b83776 merge from open-source master 
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
 2010-06-07 16:37:22 -07:00