23917 Commits

Author SHA1 Message Date
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
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
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
Jean-Baptiste Queru
6af5a9ea4d Merge "Canvas.drawVertices: correct color range-check" 2010-06-07 14:51:42 -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
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
Jaikumar Ganesh
e50ab5f94c Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:09:39 -07:00
Jaikumar Ganesh
f1048cdb68 Serialize all commands for a particular profile.
Change-Id: I843ea9ab0bb2372c8316e99e8c083a9939ad774a
2010-06-07 14:08:38 -07:00
David 'Digit' Turner
3f0ed2a52a am e0cbd72b: Merge "PackageManagerService: always install native binaries from .apk" into kraken 2010-06-07 14:04:20 -07:00
David 'Digit' Turner
e0cbd72b33 Merge "PackageManagerService: always install native binaries from .apk" into kraken 2010-06-07 14:02:38 -07:00
Lars Dunemark
47633f8627 Removes dashes when locale and number is not NANP or Japan
Removes all dashes if locale isn't NANP or Japan and the number
don't have there country code.

Use case: If adding a number starting with 1nnnnnn and then
          trying to add a country code before (ex +46) we will first
          trigger NANP formatting with +1-nnn-nnn so when we get
          +41-nnn-nnn we will still have the old NANP formatting.
          This number should be shown as +461nnnnnn.

Change-Id: I5cab830350d785a58367eba79e268d9e8ee16aac
2010-06-07 14:00:19 -07:00
Andreas Huber
f7d1c54200 am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright. 2010-06-07 13:19:55 -07:00
Andreas Huber
a557b24ac4 Initial checkin of mpeg2 transport stream parser for stagefright.
Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
2010-06-07 13:05:37 -07:00
Andreas Huber
cd4961d99e am 455d4100: Merge "Initial checkin of "foundation" library for future stagefright development." into kraken 2010-06-07 12:51:16 -07:00
Dianne Hackborn
7d75a66cd1 am b7bb3b3d: Fix bug in reporting a processes\'s dependent component. 2010-06-07 12:51:10 -07:00
Andreas Huber
455d41002e Merge "Initial checkin of "foundation" library for future stagefright development." into kraken 2010-06-07 12:50:05 -07:00
Dianne Hackborn
b7bb3b3df6 Fix bug in reporting a processes's dependent component.
Also add new action to show an app's details.

Change-Id: I6ad3b3ac8462f5acf726ce76130882a262adff92
2010-06-07 11:01:29 -07:00
Andreas Huber
7d2f703649 Initial checkin of "foundation" library for future stagefright development.
Change-Id: I11714dcaa647d0437a13e4c5b953b35e712da8f3
2010-06-07 10:22:07 -07:00
James Dong
f520c76305 am 7a68d368: Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken 2010-06-07 10:21:10 -07:00
James Dong
7a68d3686a Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken 2010-06-07 10:19:58 -07:00
Christopher Tate
8207e2fd4a am a8ebe8b3: am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-06 12:11:54 -07:00
Dianne Hackborn
fc15bd94b0 am 168585ed: am 5474902f: Merge "xhdpi" into froyo 2010-06-06 12:11:50 -07:00
Robert Greenwalt
1bdb78c1a0 am 9c4ed139: am f9610b38: Merge "Make the DUN apn data secure." into froyo 2010-06-06 12:11:45 -07:00
Christopher Tate
a8ebe8b3f5 am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into kraken

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires
2010-06-06 12:10:08 -07:00
Dianne Hackborn
168585ed68 am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
2010-06-06 12:10:05 -07:00
Robert Greenwalt
9c4ed1394b am f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
2010-06-06 12:10:00 -07:00
Mathias Agopian
f5f7d38930 am fae5cb2b: optimize Surface.readFromParcel() 2010-06-04 19:15:46 -07:00