drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,104 Commits 1 Branch 0 Tags
Commit Graph

25104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
ae9348bc6e am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 09:20:59 -07:00
Andreas Huber
097da9644f Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 09:19:07 -07:00
Kenny Root
36a685d70f Include stdlib to fix sim build 
Change-Id: I7732461a9351f53f9ddadcfb26485f2e553e056b
 2010-06-08 08:38:34 -07:00
Leon Clarke
2dbb41d790 Merge webkit.org at r60469: Skip a new isolated world test 
Change-Id: I72f8da5c7a045dfd9ab2346d472756abcb4fe5a2
 2010-06-08 15:17:15 +01:00
Ben Murdoch
fbc5cfea45 Merge "DumpRenderTree fix." 2010-06-08 02:46:21 -07:00
Jim Miller
cfa2d7c93a am 700a9506: am cb52cb52: Fix SDK build. 2010-06-07 21:25:15 -07:00
Jim Miller
700a95068e 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
5d0cc81a34 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
cb52cb5225 Fix SDK build. 
On branch fix_sdk
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   core/java/android/app/KeyguardManager.java

Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
 2010-06-07 21:19:16 -07:00
Jim Miller
a9a0a0b298 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
c4e37ac0ea 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
7d70358a03 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
bde25c2077 Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-07 19:24:45 -07:00
Jim Miller
d6b5705e18 Fix 2737842: disable keyguard API when device policy is enabled. 
This fix disables KeyguardManager's enable/disable API when any
device policy admin requests a policy that enforces a password.

Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
 2010-06-07 19:19:29 -07:00
Christopher Tate
40c20b06ba 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
d5f401ba51 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
8a7fa44fdc 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
ac24d23cd4 Merge "Don't bring up Launcher until after boot complete" into froyo 2010-06-07 18:46:46 -07:00
Christopher Tate
04c0af8f55 Don't bring up Launcher until after boot complete 
The preboot upgrade handling was bringing up the acore process with a default
application object, then the normal "start the HOME app" code was bringing up
Launcher2 [hosted in acore] in anticipation of boot completion... but then it
saw that the host process was alive and continued with Launcher2's init.
Launcher2 depends on a custom application object, however, so it crashed
immediately.

This change ensures that the HOME app is not actually initted at that level
until after boot has completed, at which point its proper application class
can be instantiated.

Fixes bug #2732250

Change-Id: I1a15384e2c0d50e14300df0c0db236bd7b1a187c
 2010-06-07 18:35:20 -07:00
Dianne Hackborn
fe2c0864f1 am 0bc0a46a: am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-07 18:34:10 -07:00
Dianne Hackborn
04cadabd95 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
0bc0a46ae8 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
d1d9047d5c Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-07 17:32:02 -07:00
Dianne Hackborn
8377fc0f36 Fix issue #2749322: addPackageToPreferred throws SecurityException 
Change-Id: I96cdc110fd9acca4b6c95d281e819bad1e4557f8
 2010-06-07 17:30:57 -07:00
Robert Greenwalt
ee09dc67ad am 7db534fa: am 5a671d03: Cut logging, boost efficiency of ThrottleService 2010-06-07 17:00:41 -07:00
Robert Greenwalt
a6be8a42f7 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
7db534fac4 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
d994dcbd81 am cefdedc3: merge from froyo-plus-aosp 2010-06-07 16:45:04 -07:00
Robert Greenwalt
5a671d03e3 Cut logging, boost efficiency of ThrottleService 
Changed the Alarms to be non-waking.

bug:2748959
bug:2747862
Change-Id: I9e4294162a4fc2f90aed36393b858edcf82aa307
 2010-06-07 16:43:16 -07:00
The Android Open Source Project
cefdedc369 merge from froyo-plus-aosp 
Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e
 2010-06-07 16:42:09 -07:00
The Android Open Source Project
c1038e778f merge from open-source master 
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
 2010-06-07 16:37:22 -07:00
The Android Open Source Project
7ad843d66d merge from open-source master 
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
 2010-06-07 16:32:53 -07:00
Andreas Huber
7a747b8e0d Initial checkin of preliminary rtsp support for stagefright. 
Change-Id: I0722aa888098c0c1361c97a4c1b123d910afc207
 2010-06-07 15:34:45 -07:00
Andreas Huber
9258ad7d78 am 6fa5360e: am 2cbff0ed: Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken 2010-06-07 15:24:16 -07:00
Andreas Huber
6fa5360e4f am 2cbff0ed: Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken 2010-06-07 15:21:59 -07:00
Andreas Huber
2cbff0edb6 Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken 2010-06-07 15:20:14 -07:00
Adam Powell
1f60aaf5c5 Merge "Fix bug 2747634 - Crash on selecting wifi" 2010-06-07 15:13:47 -07:00
Dan Egnor
2782a3de2c Merge "Add support for logging curl commands for binary POST data" 2010-06-07 14:53:00 -07:00
Jean-Baptiste Queru
6af5a9ea4d Merge "Canvas.drawVertices: correct color range-check" 2010-06-07 14:51:42 -07:00
Brett Chabot
49466990bd Merge "2744878 com.android.server.AccessibilityManagerServiceTest:testInterrupt is failing" 2010-06-07 14:40:47 -07:00
Andreas Huber
202348e0d4 Initial checkin of preliminary support for "http live" streaming in stagefright. 
Change-Id: I20399f63d63af86a3ba22641c0e43385a108fb3f
 2010-06-07 14:35:29 -07:00
Svetoslav Ganov
5637745e59 2744878 com.android.server.AccessibilityManagerServiceTest:testInterrupt is failing 
Change-Id: I73d056c7dcf8edddae2ef9cb28ec7d2b3203bb9b
 2010-06-07 14:27:39 -07:00
Jaikumar Ganesh
e6692f0f69 am a182e12b: am 526f2ff1: Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:13:24 -07:00
Jaikumar Ganesh
daa595e733 am 8984d144: am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:13:19 -07:00
Jaikumar Ganesh
7de1392fc8 am eee1376c: am e50ab5f9: Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:13:14 -07:00
Jaikumar Ganesh
a182e12bf8 am 526f2ff1: Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:11:28 -07:00
Jaikumar Ganesh
8984d144f1 am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:11:24 -07:00
Jaikumar Ganesh
eee1376c43 am e50ab5f9: Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:11:20 -07:00
Jaikumar Ganesh
526f2ff1a5 Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:10:08 -07:00
Jaikumar Ganesh
a8c2514edd Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:09:49 -07:00