21351 Commits

Author SHA1 Message Date
Robin Lee
2cc617b2ad Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 2015-01-08 22:31:36 +00:00
Robin Lee
e53b7dd066 Revert "Profile owner hint in warning for extra CAs"
This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.

Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.

Bug: 18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
2015-01-08 22:08:42 +00:00
Dianne Hackborn
cb8d8e10b0 Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 2015-01-08 21:41:35 +00:00
Craig Mautner
62a32ee1df Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev 2015-01-08 19:09:42 +00:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting...
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
2015-01-08 10:58:45 -08:00
Craig Mautner
3d7ca31c9e Remove AppWindowTokens from exiting apps with task
When the task is removed from a task stack in window manager any
exiting activities left in the stack were orphaned. This led to a
memory leak. Removing all task activities from those that are exiting
fixes this problem.

Fixes bug 18943737.

Change-Id: I0a5ea8d2d3be89af7ccaf01385a226a2eafdf507
2015-01-08 10:56:00 -08:00
Christoph Studer
9d4b796339 Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 2015-01-08 18:44:24 +00:00
Craig Mautner
28a4cea5a0 Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev 2015-01-08 18:34:02 +00:00
Dianne Hackborn
a7881fd30b Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev 2015-01-08 18:08:13 +00:00
Andres Morales
d656955efd Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 2015-01-08 16:10:27 +00:00
tingna_sung
1ab7d3b9a8 Fix pointer index out of range exception DO NOT MERGE
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>

Fixes bug 18883936
2015-01-08 15:57:52 +00:00
Bryce Lee
c010c96fdf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 2015-01-08 04:30:13 +00:00
Jinsuk Kim
6e26f7f7b0 CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.

Bug: 18896770

Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
2015-01-08 12:51:22 +09:00
Bryce Lee
7c91446769 Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8.

Causes NPE on devices without telephony (Android Wear for example)
Bug:18922524

Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
2015-01-08 02:32:08 +00:00
Christopher Tate
bee49807dd Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 2015-01-07 23:19:50 +00:00
Andres Morales
1ce7d179bf Wipe FRP partition if OEM unlock enabled
Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.

Bug: 18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb
2015-01-07 14:46:19 -08:00
Dianne Hackborn
ab2df067fc Add new debug feature to track associations between processes. Also
add some debugging for spurious service ANRs.

Bug: 18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
2015-01-07 14:01:13 -08: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
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
374c358dd2 Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 2015-01-07 12:30:57 +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
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
5a21b0c2d0 Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 2015-01-07 00:12:17 +00:00
Christopher Tate
b89e1405cf Support single-package backup rejection by the transport
We now cleanly handle the case of the transport blacklisting specific
packages from key/value backup.  Previously we would halt the entire
backup pass and reschedule if the transport returned any error from
performBackup(pkg).  Now, we recognize the TRANSPORT_PACKAGE_REJECTED
result from that invocation, and properly drop that package's work
but proceed with running the rest of the backup queue as expected.

Bug 18694053

Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
2015-01-06 15:48:33 -08: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
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +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
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
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
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
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
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
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
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
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
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
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
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