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

21543 Commits

Author SHA1 Message Date
Filip Gruszczynski
6a0cebca80 am e5a8dd22: am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit 'e5a8dd222ab31d63c4f38fd87f909264f024530d':
  Prevent index out of bounds when using String.substring.
 2014-10-15 02:04:13 +00:00
Dianne Hackborn
133c747e10 am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-15 02:03:59 +00:00
Filip Gruszczynski
38afe56204 am f16d2264: am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit 'f16d226460cbe0800d8c3b614121cd8c09bdc9cb':
  Log wallpaper crashes.
 2014-10-15 02:03:51 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller. 
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
 2014-10-14 17:57:28 -07:00
Svetoslav
0e58b6abbe am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit '1a55dcceaa37d224312ab4b3e4ee31034fa3636d':
  Fix a NPE in device policy manager service.
 2014-10-15 00:13:03 +00:00
Svetoslav
1a55dcceaa am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit 'dc876b56217c588596661ca514b4bdb8a6cfe843':
  Fix a NPE in device policy manager service.
 2014-10-15 00:07:27 +00:00
Svetoslav
dc876b5621 Merge "Fix a NPE in device policy manager service." into lmp-dev 2014-10-15 00:02:59 +00:00
Jinsuk Kim
eaab72ac41 DO NOT MERGE CEC: Queue actions for starting later when not ready 
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17985588
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7

Conflicts:
	services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
 2014-10-14 23:49:57 +00:00
Craig Mautner
b99419aa19 am 27f80673: am ea496644: Merge "Add null check" into lmp-dev 
* commit '27f80673a0bc8997a8f878d2a062defd0f43379e':
  Add null check
 2014-10-14 23:46:22 +00:00
Craig Mautner
27f80673a0 am ea496644: Merge "Add null check" into lmp-dev 
* commit 'ea4966442cd035e592aa73c0c29225efe3f091fb':
  Add null check
 2014-10-14 23:41:26 +00:00
Craig Mautner
ea4966442c Merge "Add null check" into lmp-dev 2014-10-14 23:35:35 +00:00
Craig Mautner
29c58cad4e Add null check 
Unable to examine bugreports that die in the middle of dump().

Help for bug 17721767.

Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
 2014-10-14 16:17:06 -07:00
Svetoslav
28433dbdab Fix a NPE in device policy manager service. 
It is possible that the device does not have an owner. If there
is no owner we get a NPE when asking the device policy manager
for cross-profile widget providers.

bug:17989189

Change-Id: I5759f2dec160ed8076ab47fdf09134f78c57458d
 2014-10-14 15:53:17 -07:00
Jeff Hao
1201d2a018 am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit 'dbfbb17512fe6a5b3c7198d60b6a149969174a71':
  Backport of ordering apps for boot dexopt.
 2014-10-14 22:31:16 +00:00
Filip Gruszczynski
3d5ecf13e0 am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit '129f1946a1bc32ac519334283538c9e24588e998':
  Prevent index out of bounds when using String.substring.
 2014-10-14 22:04:05 +00:00
Jeff Hao
dbfbb17512 Backport of ordering apps for boot dexopt. 
This is a squashed commit of the following changes:

1. Order apps by priority when performing boot dexopt.
   (cherry picked from commit 65cde7d42d741c7d9aa2714a397b7333f688ab55)

2. Improve priority ordering of apps when performing boot dexopt.
   Added core apps and updated system apps.
   (cherry picked from commit 272bf3a274daff62995caf05da338c1f2a73dae3)

3. Stop boot dexopt when low on memory.
   (cherry picked from commit 1d892dcb6b0ff3a50cc63e387667dc29baf1014f)

Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
 2014-10-14 15:02:37 -07:00
Filip Gruszczynski
129f1946a1 Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 2014-10-14 20:59:58 +00:00
Dianne Hackborn
f23b29ad5a am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:58:39 +00:00
Filip Gruszczynski
31278350b9 am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit '72f6e8ce81e847eb0d2eeac02ef7c4ce48ed5002':
  Log wallpaper crashes.
 2014-10-14 19:58:15 +00:00
Filip Gruszczynski
5a589430b3 Prevent index out of bounds when using String.substring. 
Change-Id: Ib30f9646e9895b6a2f065a0b2e51cf53e821b087
 2014-10-14 12:36:52 -07:00
Dianne Hackborn
a861a9d713 am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:21:18 +00:00
Dianne Hackborn
35de0e2872 Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 2014-10-14 19:16:22 +00:00
Filip Gruszczynski
72f6e8ce81 Merge "Log wallpaper crashes." into lmp-sprout-dev 2014-10-14 18:08:34 +00:00
Jeff Hao
838018b253 am b5c5354f: am 63360780: Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 
* commit 'b5c5354fdab213c28d0817169d4ed100cc3e0215':
  Stop boot dexopt when low on memory.
 2014-10-14 17:51:21 +00:00
Jinsuk Kim
584b564df0 am 20bc8c19: am 93eed0c0: CEC: Use hotplug event for MHL device registry 
* commit '20bc8c19b655a9b1416f7aa698ebd3d5e6c21dd9':
  CEC: Use hotplug event for MHL device registry
 2014-10-14 17:50:52 +00:00
Dianne Hackborn
f85e7af4d0 Fix issue #10034864: Define YouTube application as the preferred... 
...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
 2014-10-14 10:46:52 -07:00
Elliott Hughes
07b68d8ad4 am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit '81fcede86d89287a5add53b256d384f9a370d77d':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-14 17:22:44 +00:00
Jeff Hao
63360780f2 Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 2014-10-14 16:55:40 +00:00
Jinsuk Kim
93eed0c03a CEC: Use hotplug event for MHL device registry 
Substitute hotplug on event for registering MHL device as TV input.
Initializes a corresponding MHL DeviceInfo as well as MHL local device
instance.

Bug: 17349017

Change-Id: I7e55afda9390aa5fa8b7687cfa6fac132f342fe6
 2014-10-14 11:53:10 +09:00
Filip Gruszczynski
5dcc3aca42 Log wallpaper crashes. 
Change-Id: I40d9876dad2a8ec98135e3df127950dc3797040b
 2014-10-13 15:51:39 -07:00
Elliott Hughes
b8175ad3bf am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:08:39 +00:00
Elliott Hughes
c02ddd6a0a am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:04:11 +00:00
Elliott Hughes
c130b428c5 Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev 2014-10-13 20:55:30 +00:00
Elliott Hughes
9c33f28d91 Ensure that the SIM language doesn't override the user language on the encryption UI. 
Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
 2014-10-13 12:39:56 -07:00
Yohei Yukawa
d6d0c3f54a am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '84928e72e48f61644f2812a28868c9e6e91fadbe':
  Update config when "Show input method" is changed
 2014-10-13 19:11:45 +00:00
Michael Wright
d61b3014b3 am 07dee169: am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '07dee169f4efe8f5ab10a39ebf5a41563322cecd':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:11:36 +00:00
Yohei Yukawa
9ca39d744c am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '540861c925df9b3743251e5d219cd5fe790f9048':
  Update config when "Show input method" is changed
 2014-10-13 18:57:58 +00:00
Michael Wright
48ca08a21c am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '43a7dcc12b212ac4f00af294b13d931dca3c3f8d':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:57:50 +00:00
Yohei Yukawa
540861c925 am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
  Update config when "Show input method" is changed
 2014-10-13 18:48:16 +00:00
Michael Wright
43a7dcc12b am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:48:07 +00:00
Yohei Yukawa
2dfd8d578a Merge "Update config when "Show input method" is changed" into lmp-dev 2014-10-13 18:42:50 +00:00
Michael Wright
265d3e9d3e Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev 2014-10-13 17:30:32 +00:00
Jeff Hao
1d892dcb6b Stop boot dexopt when low on memory. 
Bug: 17641843
Change-Id: Ie1967fc2cd9bdd258bfee442968f98200edaf62e
 2014-10-13 10:27:29 -07:00
Jinsuk Kim
95bc6f1623 am 2c716fcf: am e46fdb43: Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 
* commit '2c716fcf8f29ffff705316db1ac4a23b9f441502':
  CEC: Queue actions for starting later when not ready
 2014-10-13 05:26:33 +00:00
Jinsuk Kim
e46fdb43c0 Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 2014-10-13 05:16:11 +00:00
Jinsuk Kim
0e5892213b am 5ddae6ac: am 8ea712f4: Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev 
* commit '5ddae6ac3d96f0edaa0286143519607f97dd9c08':
  CEC: Do not publish the service if native/HAL is not ready
 2014-10-13 03:38:43 +00:00
Jinsuk Kim
6f87b4e6b6 CEC: Queue actions for starting later when not ready 
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17933899
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7
 2014-10-13 11:38:16 +09:00
Jinsuk Kim
08f1ab02d6 CEC: Do not publish the service if native/HAL is not ready 
This helps detect the issue sooner by checking the availability
of the service and avoid crashing at a later point.

Bug: 17897529
Change-Id: Iab0eeffb00221e5a7e6e36d446eeef7c92da1f82
 2014-10-13 10:44:50 +09:00
Dianne Hackborn
89bd24067a am ce00f22f: am ec941de2: am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'ce00f22f26d5c748c7d4d82bc72480c42f0de45a':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 04:55:31 +00:00
Dianne Hackborn
ec941de2fc am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'eddb2b3805d323ad1b6e1a09f2e64736b2eb2cf4':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 02:50:12 +00:00