Wonsik Kim
a6b1bf2394
am fa8276c3: am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev automerge: b429c01
...
* commit 'fa8276c3edb1b71d8e49bb8be1066e86a0d8abb2':
TIF: set audio gain properly
2014-11-20 21:29:27 +00:00
Wale Ogunwale
892d43bad6
am 1e910d17: am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev automerge: 005080e
...
* commit '1e910d17cef3ef21c09ead282b829ab7bb7bdedb':
Stop activity onVisibleBehindCanceled()
2014-11-20 21:24:09 +00:00
Wonsik Kim
fa8276c3ed
am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev
...
automerge: b429c01
* commit 'b429c01558c65b12e2c4ebec59f146e86aa460bb':
TIF: set audio gain properly
2014-11-20 21:22:45 +00:00
Wale Ogunwale
1e910d17ce
am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev
...
automerge: 005080e
* commit '005080e5f8c3cfd7918bb9a62e36384d6a08351e':
Stop activity onVisibleBehindCanceled()
2014-11-20 21:17:45 +00:00
Wonsik Kim
b429c01558
am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev
...
* commit '59d3669512b4fdff262ec6fe2760c9ae967eca95':
TIF: set audio gain properly
2014-11-20 07:07:51 +00:00
Wonsik Kim
59d3669512
Merge "TIF: set audio gain properly" into lmp-mr1-dev
2014-11-20 07:04:25 +00:00
Wale Ogunwale
005080e5f8
am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev
...
* commit '70273e05b26f671dcec9ff1aa4bafabb5e407895':
Stop activity onVisibleBehindCanceled()
2014-11-20 01:49:37 +00:00
Wale Ogunwale
70273e05b2
Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev
2014-11-20 01:46:28 +00:00
Riley Andrews
6d354163ca
[wip] Make the window animator rely on frameTime.
...
The window animator is looking at cpu time difference
whilst updating animations. Using the choreographer display frame
time will be a much more consistent way of estimating
the time between frames for animation.
Change-Id: If5c4034c6e1b017749d6f4ca727d564805672c39
2014-11-20 01:45:04 +00:00
Wonsik Kim
71dfa96f53
TIF: set audio gain properly
...
Bug: 18392706
Change-Id: I56c21c156a54e7d6dcf787f6b3ab4b901843b922
2014-11-20 09:54:36 +09:00
Wale Ogunwale
1f4c02bb18
Stop activity onVisibleBehindCanceled()
...
Once an activity is no longer visible behind and has released
its background resources, it is added to the list of activities
that can be stopped, but not actually stopped until the next
major event (like another activity starting). We now schedule
the idle processing once the background resources have been
released so the activity can be stopped as soon as possible.
Bug: 18191707
Change-Id: I472eee949c1a78b4d944454463f03c90e7d2618b
2014-11-19 16:25:51 -08:00
Andres Morales
2ccf4779ad
am 39843bfb: am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev
...
* commit '39843bfbedd0bf51ae0214869ac54e39c1126205':
Add a checksum to FRP partition
2014-11-19 18:26:36 +00:00
Andres Morales
39843bfbed
am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev
...
* commit '29db396ea91651f2f17e21629f782ce4c19e0f33':
Add a checksum to FRP partition
2014-11-19 18:21:19 +00:00
Andres Morales
29db396ea9
am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev
...
* commit '6722598ef3d23f75d244399536b2302b30388c51':
Add a checksum to FRP partition
2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3
Merge "Add a checksum to FRP partition" into lmp-mr1-dev
2014-11-19 18:09:53 +00:00
Jeff Sharkey
c4b41f565a
am e5186c12: am 40602179: Merge "Default icon is shown after uninstalling updated priv-app"
...
* commit 'e5186c12ec1c95b75d0fef1a38f94483e31aae6f':
Default icon is shown after uninstalling updated priv-app
2014-11-19 17:57:15 +00:00
Jeff Sharkey
e5186c12ec
am 40602179: Merge "Default icon is shown after uninstalling updated priv-app"
...
* commit '4060217905d805897141b028126e0aa51136cf7b':
Default icon is shown after uninstalling updated priv-app
2014-11-19 17:49:07 +00:00
Akira Numata
e50bc6fd29
Default icon is shown after uninstalling updated priv-app
...
If updated pre-installed app is moved from "/system/app" to
"/system/priv-app" at FOTA, PackageManager does not update its
resource path correctly. This patch fixes it.
Change-Id: Iac793bcb8fd7c5bfbafd1876640b534c6da5dddf
2014-11-19 09:57:19 +09:00
Jinsuk Kim
05691638ab
am d565e033: am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev
...
* commit 'd565e0337f149f044c7117935f114c0c1a99d2df':
CEC: Use thread-safe version for avr info
2014-11-19 00:42:54 +00:00
Jinsuk Kim
d565e0337f
am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev
...
* commit '0beb76e108721a009381a84bde024fc9995eeed9':
CEC: Use thread-safe version for avr info
2014-11-19 00:36:27 +00:00
Jinsuk Kim
0beb76e108
am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev
...
* commit '9899b663f4c512e4a9acaa5508f0fd86bed6e476':
CEC: Use thread-safe version for avr info
2014-11-19 00:31:59 +00:00
Jinsuk Kim
9899b663f4
Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev
2014-11-19 00:25:43 +00:00
Jeff Sharkey
fc162cf37c
am 8bbdd1ce: am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev
...
* commit '8bbdd1ce481e3a228734d1d27f9985b38a9c0f78':
Speed up GrantUri.hashCode().
2014-11-19 00:24:29 +00:00
Christopher Tate
e9e3c476d5
am 1f284855: am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev
...
* commit '1f284855fc9abffc64b80ddd5b0864e4d25f0df7':
Prevent some alarm pathologies
2014-11-19 00:24:18 +00:00
Rubin Xu
4221126b95
am 3c1d5e2f: am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
...
* commit '3c1d5e2f9d0724f0a10313244d0ef47957d855f2':
Remove permission check in DevicePolicyManager.isUninstallBlocked()
2014-11-19 00:24:13 +00:00
Rubin Xu
dbf32fe93a
am f978e667: am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev
...
* commit 'f978e667a6395902be09f3dd6c5c6b8d17ce58da':
Fix equality test in getProfileOwnerAdmin()
2014-11-19 00:24:09 +00:00
Jeff Sharkey
8bbdd1ce48
am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev
...
* commit 'c5efb2b92a2901f71ebcab039fec24b6dd0ab927':
Speed up GrantUri.hashCode().
2014-11-19 00:20:50 +00:00
Christopher Tate
1f284855fc
am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev
...
* commit 'f066bf229cd28210af476a7a02b6901e0bd9e829':
Prevent some alarm pathologies
2014-11-19 00:19:56 +00:00
Rubin Xu
3c1d5e2f9d
am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
...
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
Remove permission check in DevicePolicyManager.isUninstallBlocked()
2014-11-19 00:19:50 +00:00
Rubin Xu
f978e667a6
am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev
...
* commit '0122db0a6397f5bd08042e1a5919114e3cccb9f4':
Fix equality test in getProfileOwnerAdmin()
2014-11-19 00:19:43 +00:00
Jeff Sharkey
c5efb2b92a
am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev
...
* commit 'd6447bbc88b8c1c238dd8e5bfb4b0daf6d2266cb':
Speed up GrantUri.hashCode().
2014-11-19 00:14:51 +00:00
Marco Nelissen
d99e62c5a0
am 7f8040a8: am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev
...
* commit '7f8040a80472b86c358f4b28ca7ec938d7fbed00':
Use stream type if set by user
2014-11-19 00:14:09 +00:00
Jinsuk Kim
86a1e5a16e
CEC: Use thread-safe version for avr info
...
getSystemAudioMode() should have used the thread-safe method
to get the information of the connected AVR.
Bug: 18426137
Change-Id: Ib3edff97337b5960160dd39d551fbfbbfdfce93b
2014-11-19 09:12:21 +09:00
Jeff Sharkey
d6447bbc88
Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev
2014-11-19 00:09:51 +00:00
Christopher Tate
f066bf229c
am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev
...
* commit '04eb368d0381b0f94365b4e270afb610fe3564c2':
Prevent some alarm pathologies
2014-11-19 00:09:50 +00:00
Rubin Xu
40603baa3e
am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
...
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
Remove permission check in DevicePolicyManager.isUninstallBlocked()
2014-11-19 00:09:43 +00:00
Rubin Xu
0122db0a63
am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev
...
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
Fix equality test in getProfileOwnerAdmin()
2014-11-19 00:09:38 +00:00
Christopher Tate
04eb368d03
Merge "Prevent some alarm pathologies" into lmp-mr1-dev
2014-11-18 23:49:54 +00:00
Rubin Xu
735f22850e
Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
2014-11-18 23:43:17 +00:00
Rubin Xu
3a7d3fc60e
Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev
2014-11-18 23:42:21 +00:00
Andres Morales
2830130770
Add a checksum to FRP partition
...
It will be hard to mandate the contents
of the FRP partition out of factory. Further, for upgrading
units, it would require that OEMs format the partition and then store
a bit saying that they've done so. This adds another attack vector.
Now defeating FRP means either compromising the FRP partition
OR wherever the OEMs decide to store that bit.
This patch adds a checksum to the FRP partition. If the checksum
is not valid, the partition is wiped - disabling OEM unlock.
This ensures that no matter what data comes on the partition, we will
always disable OEM unlock by default. It also allows OEMs to not have to
worry about initializing the partition, as it happens automatically.
Bug: 18322021
Change-Id: Ib30782baa771591c30ea95054d3b83f36fc08cc2
2014-11-18 22:52:58 +00:00
Marco Nelissen
7f8040a804
am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev
...
* commit '0acbed256eaadd3e704942405d130729d3366534':
Use stream type if set by user
2014-11-18 22:30:03 +00:00
Marco Nelissen
0acbed256e
am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev
...
* commit '6104fb2862e591fcd62660f5cd11ab5ca48adebb':
Use stream type if set by user
2014-11-18 22:25:12 +00:00
Marco Nelissen
6104fb2862
Merge "Use stream type if set by user" into lmp-mr1-dev
2014-11-18 22:20:05 +00:00
Alan Viverette
903da22db4
am 098f36c3: am a4733b68: am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev
...
* commit '098f36c302d740b6bb33ea9c1392a9551bd8ea54':
Don't ignore accessibility overlays during visibility computation
2014-11-18 22:04:34 +00:00
Jeff Sharkey
3597b55d12
Speed up GrantUri.hashCode().
...
It's used as a key for all outstanding permission grants, so let's
keep it fast.
Bug: 18381401
Change-Id: I4db8dba13302b98f33aacfa3e9acd9a394541cd0
2014-11-18 14:04:18 -08:00
Alan Viverette
098f36c302
am a4733b68: am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev
...
* commit 'a4733b68c4ccc19794e9eadcad4e1ec6691c5be2':
Don't ignore accessibility overlays during visibility computation
2014-11-18 21:56:11 +00:00
Alan Viverette
a4733b68c4
am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev
...
* commit 'fb11949d5bb810b39e34ec707fcddde345c474cd':
Don't ignore accessibility overlays during visibility computation
2014-11-18 21:51:31 +00:00
Jae Seo
dbdcfae779
am 723b3dd5: am 1d96b28d: am f0a8c3e6: Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev
...
* commit '723b3dd579f8a9352b6e666b59a1ea0e8e2b1e44':
TIF: fix NPE for TvInputHardwareManager
2014-11-18 20:21:50 +00:00
Christopher Tate
498c6cbd78
Prevent some alarm pathologies
...
* Sanity-check the recurrence interval. Some buggy apps pass seconds
where the API expects milliseconds, with the result that the device
pins the CPU at 100% trying to deliver alarm broadcasts every 60 ms
or what have you. The minimum recurrence is now 1 minute.
* Sanity-check alarms being scheduled for the immediate future. As
with the above this will catch people trying to schedule alarms
in a spammy way that keeps the device from entering low-power state.
The minimum futurity of a new alarm is now 5 seconds.
Bug 17495168
Change-Id: If8ff7d88da48960532ac21a0ba20094af9912603
2014-11-18 12:00:58 -08:00