24395 Commits

Author SHA1 Message Date
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
Christoph Studer
4a9849b1d9 NoMan: Cancel previous instance of ignored notification
When a notification is ignored due to notification group optimization,
make sure any existing instance of the ignored notification is
canceled.

Bug: 18914108
Change-Id: Ifcc4833df019ea5cb7048eaab11ae76e7fa2a31c
2015-01-06 18:55:08 +01:00
Jinsuk Kim
30a061ed4f am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev
* commit 'e96f9dd1a43e401ae3a73ac2b32bac6b6da2fe23':
  CEC: Make deviceSelect work for MHL device
2015-01-06 04:12:50 +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
riddle_hsu
22242ab29a [ActivityManager] Fix process record leakage.
Symptom:
Remain dead process record in mLruProcesses.

Root cause:
When a process dies and needs to restart immediately.
The process record will not be removed from mLruProcesses
in handleAppDiedLocked (return kept=true).
If the restarting process start timeout, the record in
mLruProcesses will not be removed.

Solution:
Call removeLruProcessLocked in processStartTimedOutLocked.

Change-Id: I1935ccc586016cb4e90dfdfac96cc88931553d5f
2015-01-06 02:31:06 +00: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
c7ad8a61b8 am 31d73dce: am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev
* commit '31d73dce255db34e68ee77bba8c48541378004dd':
  DO NOT MERGE Fix typo
2015-01-06 00:24:13 +00: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
5f86b66c9b am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev
automerge: d17218e

* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
  Fix issue #18901214: APR: Frequent crash in android
2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android
2015-01-05 23:15:10 +00: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
62fbd4feb1 am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev
automerge: b8e5139

* commit 'b8e51390af6015c1eaff7679546a5a7d2dfa701d':
  Don't restore persistent task to a stack until needed.
2015-01-05 22:14:47 +00:00
Wale Ogunwale
b8e51390af am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev
* commit '170a678cd2b7073edd061765dabd4a754f562e60':
  Don't restore persistent task to a stack until needed.
2015-01-05 22:12:28 +00: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
Sungsoo Lim
64a5234a3a am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev
* commit '269aad530493ccdd7ec78c1704eebd4476348b5d':
  DO NOT MERGE Make mute/unmute work
2015-01-05 04:36:57 +00: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
871a962b79 am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
* commit 'e9a205cec4001faab38a1fdba88b29125bfe37d1':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
2015-01-05 02:42:06 +00: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
Dongwon Kang
766dc9e6ab Merge "TIF: Add a null checking in TvInputHardwareManager." 2015-01-05 01:20:43 +00:00
Sungsoo Lim
9dcba434e2 Fix typo
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
2015-01-05 09:13:20 +09:00
Jinsuk Kim
65e644b449 am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode>
automerge: e82e47e

* commit 'e82e47e9cb01a19e88a89f8a43a7a15540b96869':
  CEC: Buffer <Set System Audio Mode>
2015-01-03 21:27:36 +00:00
Jinsuk Kim
e82e47e9cb am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode>
* commit '270686b681e74622a09bb3081b1e03c55f692c3f':
  CEC: Buffer <Set System Audio Mode>
2015-01-03 21:25:40 +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
riddle_hsu
1f5ac4d322 [ActivityManager] Distinguish FG or BG receiver finished
Symptom:
Assume a foreground broadcast FG and a background BG.
If a recevier registers both FG and BG. When sending
BG and FG to the receiver, and the receiver BG receiver
completes first, its finishReceiver will trigger next FG
receiver rather than BG, and also deliver wrong result
code/data to the next.

More detail and sample:
https://code.google.com/p/android/issues/detail?id=92917

Root cause:
Due to BroadcastQueue:getMatchingOrderedReceiver will match
by receiver(IBinder), so the caller ActivityManagerService:
broadcastRecordForReceiverLocked will always match the first
queue(fg) if a receiver is both receiving fg and bg.

Solution:
Add a parameter flags to finishReceiver, then server side
could know the finished receiver should belong to which queue.

Another general solution but with bigger scope:
I60dce4a48e20c1002a61a979e4d78b9b0a8b94a0

Change-Id: I913ca6f101ac8ec6c7a8e42754e6781f80247b7f
2015-01-03 15:38:21 +08: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
290e91107c Remove deprecated upgrade path for relatedGroupId
As per note this has been unused for upwards of 6 months and its
attribute string is no longer referenced anywhere else in Android.

Change-Id: I5f95ffa6b3d91fca203f2d030d40df3fd55b6a70
2014-12-30 17:36:00 +00:00
Narayan Kamath
df44485698 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."
automerge: bf0c614

* commit 'bf0c614d33673a0a037e317c8c25ad2e6c24e77d':
  Throw IllegalArgumentException on invalid hex-strings.
2014-12-29 16:22:57 +00:00
Narayan Kamath
bf0c614d33 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."
* commit 'c97d1fbbe00a91b1a67b7c526d9cf11ffec741fa':
  Throw IllegalArgumentException on invalid hex-strings.
2014-12-29 16:20:32 +00:00
Narayan Kamath
5106dd44f9 Merge "Throw IllegalArgumentException on invalid hex-strings." 2014-12-29 16:08:34 +00:00
Esteban Talavera
ea84327fa4 Merge "Remove deprecated version of setProfileOwner that takes packageName" 2014-12-29 10:55:31 +00:00
Sungsoo Lim
2021082b4a Merge "Make mute/unmute work" 2014-12-29 04:52:21 +00:00
Sungsoo Lim
d1851e6e4e Make mute/unmute work
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
2014-12-29 11:34:23 +09:00
Craig Mautner
ebc440ea5d am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
automerge: 3551ce9

* commit '3551ce9d8e8244376d63b65e0352ffa03198ba2a':
  [ActivityManager] Reset ActivityRecord's waitingVisible
2014-12-29 01:59:28 +00:00
Craig Mautner
3551ce9d8e am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
* commit '443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
  [ActivityManager] Reset ActivityRecord's waitingVisible
2014-12-29 01:56:42 +00:00
Craig Mautner
cfa31a605c Merge "[ActivityManager] Reset ActivityRecord's waitingVisible" 2014-12-29 01:30:50 +00:00
Robin Lee
77f9a44adb am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev automerge: c9db16c
automerge: b6b7d42

* commit 'b6b7d4251cdab1843ae9b2ae167ac9276ada241e':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
2014-12-28 05:51:19 +00:00