Craig Mautner
bf159f9de5
am 3f4a10a5: am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev
...
* commit '3f4a10a5eac64960bbae4af2b1f44cdc0d5309c3':
Disassociate system windows from apps
2014-08-13 18:27:43 +00:00
Craig Mautner
4a8dddbf18
Clean up app following death when creating service
...
If an app has died, run through the cleanup before relaunching its
service.
Also a little simplifying refactor.
Fixes bug 16979752.
Change-Id: I376cbef2ea00fc626588386317f092cc6dea0bdc
2014-08-13 18:15:28 +00:00
Sandeep Siddhartha
93bcd0755e
am 01ce912e: am 40d28dd1: am bd3a24b1: Fix delete clause for sound model DB
...
* commit '01ce912e04e499d8b7d72396514515a7ac5367b9':
Fix delete clause for sound model DB
2014-08-13 18:09:01 +00:00
destradaa
f7a73bce0c
am a92a5853: am 84e1d77c: am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
...
* commit 'a92a58533f9f082ff8f2cea866f127aac6d52fbc':
Update FlpHardwareProvider native layer, to stop raising FatalErrors.
2014-08-13 18:08:56 +00:00
Sandeep Siddhartha
9caf4f9da7
am 40d28dd1: am bd3a24b1: Fix delete clause for sound model DB
...
* commit '40d28dd13c0b7d16cb0eb27ab37fae1bdaf102c3':
Fix delete clause for sound model DB
2014-08-13 18:03:58 +00:00
destradaa
fa3f594bda
am 84e1d77c: am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
...
* commit '84e1d77cc8ec8ad1c8f2c6f07eeeb1f1ff62da27':
Update FlpHardwareProvider native layer, to stop raising FatalErrors.
2014-08-13 18:03:53 +00:00
Sandeep Siddhartha
a31413a325
Fix delete clause for sound model DB
...
Since UUIDs contain '-'s they need to be wrapped within quotes
Bug: 16985919
Change-Id: I624a512ca7fc2494a7737b5465c94a9e161dec88
2014-08-13 10:52:17 -07:00
Adrian Roos
7a3ce37a4f
am a7f0f177: am 38afacab: am 6b3fc443: Dismiss bouncer when onTrustInitiatedByUser fires
...
* commit 'a7f0f17700c722a4340274717486065a7e7d7861':
Dismiss bouncer when onTrustInitiatedByUser fires
2014-08-13 17:38:25 +00:00
Adrian Roos
a42bf4c31b
am 38afacab: am 6b3fc443: Dismiss bouncer when onTrustInitiatedByUser fires
...
* commit '38afacabc5ee4fb29e6d1271643dc0f76fbae94b':
Dismiss bouncer when onTrustInitiatedByUser fires
2014-08-13 17:33:13 +00:00
Adrian Roos
2bb8bfd1e8
Dismiss bouncer when onTrustInitiatedByUser fires
...
Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.
Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
2014-08-13 17:24:36 +00:00
destradaa
0b36d958c6
am 0b9359b8: am d5f85ed7: am 02281fbb: Merge "Add additional logging around AGPS IP Address handling." into lmp-dev
...
* commit '0b9359b8c9ab6cdd8bbd3ecaf552e6785e061ecc':
Add additional logging around AGPS IP Address handling.
2014-08-13 17:22:13 +00:00
destradaa
2abc32c18b
am d5f85ed7: am 02281fbb: Merge "Add additional logging around AGPS IP Address handling." into lmp-dev
...
* commit 'd5f85ed7a6e2dafe8f3fafed3b779515915c39ad':
Add additional logging around AGPS IP Address handling.
2014-08-13 17:17:07 +00:00
Jae Seo
67241476f3
Merge "TIF: Create TvInputState only once per each input" into lmp-dev
2014-08-13 16:52:03 +00:00
Jae Seo
9cc28e5175
TIF: Create TvInputState only once per each input
...
Also removed mClientTokens which is no longer used.
Bug: 16970763
Change-Id: I4fc276241c33f88ed932ce6c703bdb3f771eb7d4
2014-08-13 11:06:53 -07:00
Jean-Michel Trivi
684ac24bd9
am 4998fa89: am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
...
* commit '4998fa89e9978c7d84614f70c0cd56420538c13d':
Add support for AudioAttributes in android.media.Ringtone
2014-08-13 16:11:29 +00:00
Jean-Michel Trivi
114e293143
am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
...
* commit '94dc549b6fe45fd4bde0bedf035fb34eb4b797b8':
Add support for AudioAttributes in android.media.Ringtone
2014-08-13 16:07:32 +00:00
John Spurlock
5a5ecf5fc8
am c298dc9e: am 5f5a53d4: am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev
...
* commit 'c298dc9ecab7dcb9b5d51a49bfb34cb26cf10583':
Send LED signal up to SystemUI regardless of setting.
2014-08-13 15:23:46 +00:00
John Spurlock
401851159c
am 5f5a53d4: am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev
...
* commit '5f5a53d4ef5ae248814df733dc32f24f80530f33':
Send LED signal up to SystemUI regardless of setting.
2014-08-13 15:19:54 +00:00
Jorim Jaggi
dacc8b1e13
am b12665a1: am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev
...
* commit 'b12665a10286ef1d552e7881cd2f6320203927a6':
Lockscreen launch animations
2014-08-13 14:18:07 +00:00
Jorim Jaggi
728f39f578
am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev
...
* commit '119b3c40078d532dce4b1de56f4645b6ea587874':
Lockscreen launch animations
2014-08-13 14:13:41 +00:00
Narayan Kamath
4dfae0ff15
am 4f336f4a: am 8a4c1f74: am a76f47ee: Persist the cpuAbiOverride setting.
...
* commit '4f336f4aa318b9cf26cbd4983324b9404cad4c91':
Persist the cpuAbiOverride setting.
2014-08-13 11:56:56 +00:00
Narayan Kamath
1c002e9f50
am 8a4c1f74: am a76f47ee: Persist the cpuAbiOverride setting.
...
* commit '8a4c1f74b4032613807bf4589430acdfc0f2e535':
Persist the cpuAbiOverride setting.
2014-08-13 11:52:54 +00:00
Narayan Kamath
4903f64ba2
Persist the cpuAbiOverride setting.
...
If an app is installed with an ABI override (adb install -r --abi)
we should remember this so that we don't revert to the scan derived
ABI on the next reboot.
bug: 16476618
Change-Id: I6085bc0099eb613dd9d3b07113c7c13859780697
2014-08-13 12:41:19 +01:00
Narayan Kamath
24c003a8f8
am d85cca85: am 1c2b4c39: am 5d171a2b: Fix a couple of PM warnings.
...
* commit 'd85cca85a5f8b685d92fc722e85d74615c65bae0':
Fix a couple of PM warnings.
2014-08-13 11:20:18 +00:00
Narayan Kamath
2c76715154
am 1c2b4c39: am 5d171a2b: Fix a couple of PM warnings.
...
* commit '1c2b4c39b4a7718b95b13f69ec848479ab5200d7':
Fix a couple of PM warnings.
2014-08-13 11:15:24 +00:00
Narayan Kamath
20200849d1
Fix a couple of PM warnings.
...
- "Could not delete native binary" : This one is a bit of
a WTF. git history tells us this code has been around for
a very long time (the warning's new though). It's a no-op
because codePath always contains the *current* codePath and
trying to remove native libs from the current codePath will
do nothing for bundled apps. This code sounds like it wants
to delete dangling native binaries for system apps that were
upgraded during an OTA. This sounds like a wrong place to do
that, though.
- "Unrecognized code path" : This one's harmless and removed
by moving this call closer to where it's used.
bug: 16823001
Change-Id: I9b40ae507b2c80ff3fdd45d5699df62bfc86514f
2014-08-13 11:05:58 +00:00
Alexandra Gherghina
32b12d761c
am f313cbe0: am 25332ad5: am af9c6d08: Merge "Bugfix: adds extra null check" into lmp-dev
...
* commit 'f313cbe08ad0362c0677149815944c07c6cce3fe':
Bugfix: adds extra null check
2014-08-13 10:09:29 +00:00
Alexandra Gherghina
fc2abe8626
am 25332ad5: am af9c6d08: Merge "Bugfix: adds extra null check" into lmp-dev
...
* commit '25332ad5664112e10b71265fe5b6ebeb590e1dce':
Bugfix: adds extra null check
2014-08-13 10:04:07 +00:00
Ji-Hwan Lee
ce1a09c534
am 107517d4: am f7b5efc1: am 88d355e7: Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev
...
* commit '107517d4694912ec034ce4703e7f840e5d4ba934':
TIF: Fix release logic for hardware wrapper input
2014-08-13 06:55:21 +00:00
Ji-Hwan Lee
e42b655a71
am f7b5efc1: am 88d355e7: Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev
...
* commit 'f7b5efc1293079e7d85aaf6f1720903558cea86f':
TIF: Fix release logic for hardware wrapper input
2014-08-13 06:51:27 +00:00
Wonsik Kim
f52107a516
am a7072a1b: am 0cb41226: am 78ed5c9d: Merge "TIF: fix parental control data inconsistency" into lmp-dev
...
* commit 'a7072a1b9a32a6de823abc9ab13c03b44f100cc2':
TIF: fix parental control data inconsistency
2014-08-13 05:59:50 +00:00
Wonsik Kim
927e31e1a3
am 0cb41226: am 78ed5c9d: Merge "TIF: fix parental control data inconsistency" into lmp-dev
...
* commit '0cb41226ef116ee81e38984181edd1b13316c6c6':
TIF: fix parental control data inconsistency
2014-08-13 05:54:57 +00:00
Yuncheol Heo
8227f0e495
am 7538ad0e: am df4c5298: am 09f15570: Merge "Implement MHL RAP reception." into lmp-dev
...
* commit '7538ad0eb81f75fb868257f21e96b6a8e33a9ae9':
Implement MHL RAP reception.
2014-08-13 05:20:25 +00:00
keunyoung
6674255bd9
am 40157808: am eef45610: am 435edc40: fix wrong flag check for virtual display
...
* commit '4015780870bcf89b69d0df83b0e217f5650f701a':
fix wrong flag check for virtual display
2014-08-13 05:20:15 +00:00
Jae Seo
193c78ce5b
am cd6e41be: am 3f96209d: am bb1586c1: Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev
...
* commit 'cd6e41bea629da88472064ce076b20ff182866b9':
TIF: Temporarily disable permission check for parental controls
2014-08-13 05:20:10 +00:00
Jinsuk Kim
041c677816
am e2a34322: am ecfcfcea: am 4fec909c: CEC: Remove timeout from deviceSelect processing
...
* commit 'e2a34322f67e959d1c6699838fea9688dddfaf1c':
CEC: Remove timeout from deviceSelect processing
2014-08-13 05:20:06 +00:00
Yuncheol Heo
7dc08e873c
am df4c5298: am 09f15570: Merge "Implement MHL RAP reception." into lmp-dev
...
* commit 'df4c5298f780181768eb916df9fa23d2d145a078':
Implement MHL RAP reception.
2014-08-13 04:26:23 +00:00
keunyoung
fd740ec78b
am eef45610: am 435edc40: fix wrong flag check for virtual display
...
* commit 'eef45610fca1078167b68f722abddb7435f05913':
fix wrong flag check for virtual display
2014-08-13 04:26:10 +00:00
Jae Seo
fe90d78e54
am 3f96209d: am bb1586c1: Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev
...
* commit '3f96209d8791524f1d5df8ae23fffaeaa8725c47':
TIF: Temporarily disable permission check for parental controls
2014-08-13 04:26:04 +00:00
Jinsuk Kim
3ca0fb8e1d
am ecfcfcea: am 4fec909c: CEC: Remove timeout from deviceSelect processing
...
* commit 'ecfcfceae31261a478162f935ce350ba724fb74d':
CEC: Remove timeout from deviceSelect processing
2014-08-13 04:25:57 +00:00
RoboErik
1d2a1c917f
Merge "Pipe caller's identity through volume methods" into lmp-dev
2014-08-13 01:30:58 +00:00
RoboErik
0dac35af2c
Pipe caller's identity through volume methods
...
setStreamVolume and adjustStreamVolume were always being called
from the session service's uid/package. This adds the plumbing to
allow the original app's info to be passed in to the audio service
when volume is changed.
Change-Id: Ib36639dab1e518b435161dc453c8ba9351df3e9b
2014-08-14 10:21:26 -07:00
keunyoung
48054241eb
fix wrong flag check for virtual display
...
- FLAG_NEVER_BLANK was always set for non-public display
bug: 16958538
Change-Id: Ia147ac3ca39d687e60ec4b77726f6b6e4c3aeb3b
2014-08-13 01:14:19 +00:00
Jinsuk Kim
8e083ec044
CEC: Remove timeout from deviceSelect processing
...
20-second timeout set for incoming <active source> command after
<set stream path> is moved out of HdmiControlService, to
HDMI input service.
Bug: 16967429
Change-Id: I5b50b0187e562b51e227a29e54824740ca37906e
2014-08-13 00:53:28 +00:00
David Christie
c03c79e1d8
am 737bc478: am eb8d2a14: am c098598e: Disable GPS when battery saver is on and screen is off. Bug: 15348895
...
* commit '737bc4789edd9b2373d6d3c8ac88be71b1cca3aa':
Disable GPS when battery saver is on and screen is off. Bug: 15348895
2014-08-12 23:45:00 +00:00
David Christie
b09901f6f9
am eb8d2a14: am c098598e: Disable GPS when battery saver is on and screen is off. Bug: 15348895
...
* commit 'eb8d2a144be7b222b7e7f34f9e5cb4d7ff678a85':
Disable GPS when battery saver is on and screen is off. Bug: 15348895
2014-08-12 23:41:03 +00:00
Winson Chung
eb0cefa965
Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev
2014-08-12 23:14:48 +00:00
Winson Chung
60a729c8e9
Adding scrim to task views. (Bug 15704955)
...
- Fixing issue with focus animations not happening for new views
Change-Id: I3134f25becf06db343aa30ea80cb33514cd99d06
2014-08-13 15:55:15 -07:00
John Spurlock
55b0abd75c
Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev
2014-08-12 23:14:48 +00:00
John Spurlock
3929232cf9
Send LED signal up to SystemUI regardless of setting.
...
Let it make an independent decision about whether or not to
do anything with it.
Bug:17001245
Change-Id: Ie494abec423f3620bf142ad332bb5f0a4d4341a5
2014-08-13 11:00:59 -04:00