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

21550 Commits

Author SHA1 Message Date
RoboErik
13d1057d5b am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE 
* commit '2610d71251e3e376e2514f20986c81e5d55f1b55':
  Don't unmute when trying to show volume UI. DO NOT MERGE
 2015-01-07 22:00:28 +00:00
RoboErik
2610d71251 Don't unmute when trying to show volume UI. DO NOT MERGE 
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.

bug:18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
 2015-01-07 20:13:31 +00:00
Wale Ogunwale
6763058fe7 am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 
* commit 'f61bc8a2624bc70c903238229a62abc3351ed620':
  Bring task with root activity to front when launching from recents.
 2015-01-07 18:08:55 +00:00
Wale Ogunwale
f61bc8a262 Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 2015-01-07 18:02:41 +00:00
Robin Lee
26e2da8ff8 am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '374c358dd201583771b7aa391c56618548f543a6':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:36:11 +00:00
Robin Lee
374c358dd2 Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 2015-01-07 12:30:57 +00:00
Sungsoo Lim
8b2b71f511 am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev 
* commit '71d8b8ce99296fdc9e4420e4d43daa6e65c65c61':
  DO NOT MERGE Implement cloneTvInputEvent
 2015-01-07 08:04:07 +00:00
Sungsoo Lim
71d8b8ce99 Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev 2015-01-07 07:58:18 +00:00
Wonsik Kim
ee4da17344 am cee5c8ed: Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev 
* commit 'cee5c8edeedb2723476d185027107faaa5fa1cec':
  DO NOT MERGE TIF: change TvInputHal events to run on its own thread
 2015-01-07 07:35:33 +00:00
Wonsik Kim
cee5c8edee Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev 2015-01-07 07:30:53 +00:00
Wale Ogunwale
7bc33c0d25 Bring task with root activity to front when launching from recents. 
Change makes sure we cover all cases where a task should be brought
to front if it already has a root activity and we are launching
from recents.

Bug: 18846206
Change-Id: I2e67a4c163c5a5ed6784ed620583f85d9c6ed731
 2015-01-06 16:45:04 -08:00
Shishir Agrawal
d0173277b2 am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 
* commit '5a21b0c2d0fca36fbbfb32641002ad4122c6b128':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-07 00:16:56 +00:00
Shishir Agrawal
5a21b0c2d0 Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 2015-01-07 00:12:17 +00:00
Shishir Agrawal
fabbdf7204 GpsLocationProvider: Read data enabled status from TelephonyManager. 
Bug: 18814559
Change-Id: I1488bd763d95d5ad087bc4ceb5f4c3767c05b62f
 2015-01-06 14:35:31 -08:00
Christopher Tate
0a511d33b0 am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '1c6014e77dfad1a7af229d642df7b7300beee721':
  Remove the "backup_data_changed" event log
 2015-01-06 18:16:43 +00:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
6f36bd3a00 am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '5fe8197fde93f659acbbbdd5dda9c7eac69c468f':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 18:07:26 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Jinsuk Kim
e96f9dd1a4 am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit 'b0b4921bcbb0619587509b882d33da52ebb98106':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 04:06:35 +00:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device 
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
 2015-01-06 11:52:14 +09:00
Christopher Tate
603ad6f7d0 Remove the "backup_data_changed" event log 
Nowadays it's just spammy and uninformative, so away it goes.

Bug 18833115

Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
 2015-01-05 17:07:57 -08:00
Sungsoo Lim
31d73dce25 am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 
* commit '2bdf89b167d709e170150e5ae5bf888e6535c1fd':
  DO NOT MERGE Fix typo
 2015-01-06 00:18:35 +00:00
Sungsoo Lim
2bdf89b167 Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 2015-01-06 00:13:14 +00:00
Dianne Hackborn
c478cf5185 Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit 
No longer modify the base constants when computing oom adj values.

Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
 2015-01-05 16:05:05 -08:00
Dianne Hackborn
24bc8d761a am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:09:07 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android 
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
 2015-01-05 14:40:24 -08:00
Wale Ogunwale
170a678cd2 am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
* commit '1d893785bdd8af210eab861653e3e7664c728897':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:06:43 +00:00
Wale Ogunwale
1d893785bd Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev 2015-01-05 22:03:21 +00:00
Robin Lee
e1d8dcd9e1 Profile owner hint in warning for extra CAs 
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I58bddb162799481d5e8feb169b0c0bff17cbeeb7
 2015-01-05 19:52:54 +00:00
Sungsoo Lim
d5489220e2 DO NOT MERGE Fix typo 
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
(cherry picked from commit 9dcba434e27ec4de87eac1448ded4126b3f97773)
 2015-01-05 05:50:21 +00:00
Sungsoo Lim
62f38d14c5 DO NOT MERGE Implement cloneTvInputEvent 
memcpy() only copies the memory address value of device_info.audio_address,
and it could be invalid when onDeviceAvailable() is called.

Bug: 18819334
Change-Id: I827da8032a982abf3029874b8454ca79290bb0e0
(cherry picked from commit 898de6fd8c78d84ae1425e052b27a97ec6f230ad)
 2015-01-05 13:38:08 +09:00
Wonsik Kim
a617074c53 DO NOT MERGE TIF: change TvInputHal events to run on its own thread 
Bug: 18688119
Change-Id: Id60f82295cdbc45065be416c9828eae144b6799f
(cherry picked from commit 57b37f610d33989f1b23e1b8d9e61fb177456364)
 2015-01-05 13:34:49 +09:00
Sungsoo Lim
269aad5304 am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit 'b65ad80de116f42fb3f2821363d52ce71e553517':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:29:23 +00:00
Sungsoo Lim
b65ad80de1 Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 2015-01-05 04:25:12 +00:00
Sungsoo Lim
48248c80e5 DO NOT MERGE Make mute/unmute work 
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit d1851e6e4e49b6a45d9e013de2e1384711975328)
 2015-01-05 11:50:49 +09:00
Dongwon Kang
e9a205cec4 am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit '017bb8523dd7c3dbfd00c055fde241de4dca9da2':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:26:15 +00:00
Dongwon Kang
017bb8523d DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)
 2015-01-05 02:12:44 +00:00
Jinsuk Kim
270686b681 am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit 'ad1e3d7df42376cd2a257b6c3b2fed540658a6e3':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:20:30 +00:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode> 
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
 2015-01-02 16:08:56 +09:00
Robin Lee
c9db16c591 am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
* commit 'b4b14e391dbcde537350ccf649b3603cafba1e6c':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-23 13:29:05 +00:00
Robin Lee
b4b14e391d Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev 2014-12-23 12:30:28 +00:00
Jinsuk Kim
266f2b047e am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '92ae5abf4dac470c5c915ec4782d5af6f251d257':
  CEC: Let the caller check CEC device type
 2014-12-22 22:53:58 +00:00
Jinsuk Kim
92ae5abf4d Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 2014-12-22 22:48:45 +00:00
Jinsuk Kim
98d760e1c3 CEC: Let the caller check CEC device type 
Device event listener mechanism invoke the callback on all kinds
of devices in order to deal with a caller who wants to get notified
for all types. TIF was changed to check the device type to make
sure it handles source type only.

Bug: 18832462
Change-Id: I5123fe79c09f623849b93b64d0c28e6a930dd437
 2014-12-23 07:39:11 +09:00
Robert Greenwalt
33868dab9a am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
* commit '4dcacef5c53e9d94beab777d79ecada86a15289b':
  Fix timing between bcast and net setup.
 2014-12-22 22:36:11 +00:00
Robert Greenwalt
4dcacef5c5 Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 2014-12-22 22:32:41 +00:00
Robin Lee
853964927c Revert "DevicePolicy: Don't warn about managed profile CAs" 
This reverts commit 80559f4aadb3419eecdf6bf61945af584cd2aa8a.

Bug: 18224038
Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
 2014-12-22 13:22:11 +00:00
Jinsuk Kim
ed27b72e58 Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev 
automerge: 2c8c47d

* commit '2c8c47daefc881c5603689be39b10cb93a0cabdf':
  CEC: Allow no vendor-specific data for <Vendor Command With ID>
 2014-12-20 00:00:38 +00:00