Dianne Hackborn
d6b6709b21
Merge "Fix issue #25817435 : Batterystats missing UIDs for secondary users" into nyc-dev
...
am: 966f1c9#25817435 : Batterystats missing UIDs for secondary users
2016-03-25 01:57:17 +00:00
Dianne Hackborn
966f1c9348
Merge "Fix issue #25817435 : Batterystats missing UIDs for secondary users" into nyc-dev
2016-03-25 01:50:33 +00:00
sergeyv
cee94c72b5
Merge "Clean up setLayerType and setLayerPaint" into nyc-dev
...
am: 4ce5653
2016-03-25 01:49:03 +00:00
Sergei Vasilinetc
4ce5653555
Merge "Clean up setLayerType and setLayerPaint" into nyc-dev
2016-03-25 01:42:50 +00:00
Svetoslav Ganov
d46c5c77aa
Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev
...
am: d61a57f
2016-03-25 01:38:52 +00:00
Svetoslav Ganov
d61a57fdd0
Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev
2016-03-25 01:33:38 +00:00
Ruben Brunk
328ca70753
Merge "Allow current VrListenerService to read thermal info." into nyc-dev
...
am: 41f02e5
2016-03-25 01:11:21 +00:00
Ruben Brunk
41f02e5d50
Merge "Allow current VrListenerService to read thermal info." into nyc-dev
2016-03-25 01:08:18 +00:00
Svetoslav Ganov
b2c2e452e5
Guard against a NPE when using ParceledSliceList
...
bug:27558595
Change-Id: Idaa3b37d1d3bbb10b93e08ef1976758fde0b0ce3
2016-03-24 18:01:22 -07:00
Dianne Hackborn
9cfba35020
Fix issue #25817435 : Batterystats missing UIDs for secondary users
...
Change-Id: I9ad907571f04b5825d234758347659544a4de6ab
2016-03-24 17:31:28 -07:00
sergeyv
342a7e6a7c
Clean up setLayerType and setLayerPaint
...
bug:21755299
Change-Id: I8f0953ccfc3d743abdecc8ec228ed3e1b6718c3c
2016-03-24 16:06:46 -07:00
Felipe Leme
8127d6f04f
Merge "Removed obsolete @NonNull." into nyc-dev
...
am: 657c2fa
2016-03-24 22:55:20 +00:00
Felipe Leme
657c2fa5c6
Merge "Removed obsolete @NonNull." into nyc-dev
2016-03-24 22:14:38 +00:00
Sharvil Nanavati
cb9453589e
Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev
...
am: 32dd848
2016-03-24 21:07:25 +00:00
Sharvil Nanavati
32dd848436
Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev
2016-03-24 20:17:45 +00:00
Alex Klyubin
c860aecc2f
Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev
...
am: e60d72f
2016-03-24 19:51:30 +00:00
Alex Klyubin
e60d72f49a
Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev
2016-03-24 19:46:44 +00:00
Alex Klyubin
9b59bc459b
Ignore signature stripping protection for preinstalled APKs.
...
The current build process may currently strip APK Signature Scheme v2
signatures from prebuilt APKs to be installed on the system or vendor
partitions. However, it leaves intact the signature scheme rollback
protections introduced by APK Signature Scheme v2. Due to a bug, when
the system extracts signer certificates from preinstalled APKs, it
encounters the rollback protection and aborts the extraction process.
This manifests itself as some preinstalled packages not appearing as
installed.
This change makes the system ignore signature scheme rollback
protections when extracting certificates from preinstalled APKs. This
is fine because the process of extracting certificates from
preinstalled APKs does not care about validity/integrity of signatures
and the APKs. It only cares about extracting signer certificates.
Bug: 27829513
Change-Id: I3bed463e776b057e93a0fce915db4014946be1f9
2016-03-24 12:02:20 -07:00
Alan Viverette
6d00e8f61a
Merge "Ensure correct width and height are used during popup positioning" into nyc-dev
...
am: 4a2f985
2016-03-24 18:39:48 +00:00
Robin Lee
9148d2f74d
Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev
...
am: 363e70d
2016-03-24 18:37:19 +00:00
Alan Viverette
4a2f9857c2
Merge "Ensure correct width and height are used during popup positioning" into nyc-dev
2016-03-24 18:33:57 +00:00
Robin Lee
363e70dd00
Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev
2016-03-24 18:32:52 +00:00
Joe LaPenna
248b40bfac
Merge "Allow setting doze timeouts based on system feature" into nyc-dev
...
am: 23c63dd
2016-03-24 18:24:34 +00:00
Joe LaPenna
23c63dd65f
Merge "Allow setting doze timeouts based on system feature" into nyc-dev
2016-03-24 18:18:26 +00:00
Alan Viverette
f50df4362a
Ensure correct width and height are used during popup positioning
...
Passes the width and height into findDropDownPosition() rather than
relying on global state. Ensures that an update is forced if any
aspects of the LayoutParams are changed during drop down position
computetion. Cleans up method and argument naming.
Bug: 27819843
Change-Id: Id85e2a0e81e0ea6a754dadf7c1d1c2493a5979b0
2016-03-24 14:08:24 -04:00
Yohei Yukawa
a4700fe435
Merge changes I16312592,Iadfc226e into nyc-dev
...
am: cdf90bb
2016-03-24 18:00:11 +00:00
Yohei Yukawa
cdf90bb674
Merge changes I16312592,Iadfc226e into nyc-dev
...
* changes:
Revert "Remove redundant IMM#mServedInputConnection."
Revert "Make sure to call back reportFinish() on the desired Handler."
2016-03-24 17:54:21 +00:00
Abhijith Shastry
ef68f23ef6
Merge "Add an unblock API to BlockedNumberContract." into nyc-dev
...
am: d1ceef0
2016-03-24 17:37:39 +00:00
Abhijith Shastry
d1ceef09a7
Merge "Add an unblock API to BlockedNumberContract." into nyc-dev
2016-03-24 17:33:58 +00:00
Yohei Yukawa
223db8b6f5
Revert "Remove redundant IMM#mServedInputConnection."
...
This reverts commit afb6558c8f
2016-03-24 10:26:19 -07:00
Robin Lee
a249aee10b
Declare provider.Settings intent for VPN fragment
...
Currently used for a number of tests. May also be useful for 3rd-party
apps using VPN in some manner or another.
Bug: 27700919
Bug: 26887434
Change-Id: I4d269954265a2590499e20150f009fe437c8078f
2016-03-24 17:25:06 +00:00
Yohei Yukawa
1fa5f594a2
Revert "Make sure to call back reportFinish() on the desired Handler."
...
This reverts commit 16e2c7b59a
2016-03-24 10:24:23 -07:00
George Mount
015651fa55
Merge "Invalidate entire scene root when executing the transition." into nyc-dev
...
am: f189c2f
2016-03-24 14:50:11 +00:00
George Mount
f189c2ffa2
Merge "Invalidate entire scene root when executing the transition." into nyc-dev
2016-03-24 14:45:22 +00:00
Clara Bayarri
c84e36b7ec
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
...
am: 3e5bf78
2016-03-24 13:37:26 +00:00
Clara Bayarri
3e5bf786b7
Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
2016-03-24 13:30:48 +00:00
Clara Bayarri
322e4d23ea
Merge "Keyboard Shortcuts: Add Keycodes for shortcut representation" into nyc-dev
...
am: bfd996f
2016-03-24 11:57:26 +00:00
Clara Bayarri
bfd996f5cd
Merge "Keyboard Shortcuts: Add Keycodes for shortcut representation" into nyc-dev
2016-03-24 11:49:05 +00:00
Clara Bayarri
fcd7e80b21
Keyboard Shortcuts: plumb deviceId through
...
Bug: 27673736
Change-Id: Ie72807aa8c2bfd142b081a6a915e101c16d31473
2016-03-24 11:47:32 +00:00
Clara Bayarri
4e850ffaa7
Keyboard Shortcuts: Add Keycodes for shortcut representation
...
This changes the current API given app feedback received. In order to use
keycodes as well as chars we also must implement a mapping of Keycodes to
Display labels as only keys with a single char representation are provided
by KeyCharacterMap.
Bug: 27409783
Change-Id: I3da653adc4b8cbc66a4d1aa24a5f9181f71e83c3
2016-03-24 11:47:23 +00:00
Abhijith Shastry
cdc2a4c737
Add an unblock API to BlockedNumberContract.
...
The delete API need not unblock a number if there are multiple copies of a single number.
BUG: 27790536
Change-Id: I6391b0c095827afe85f2ee5d1756741e144c8c26
2016-03-23 19:29:59 -07:00
Andreas Gampe
31e9eec4ea
Merge "Frameworks/base: Refactor package manager" into nyc-dev
...
am: a7f2bcc
2016-03-24 02:08:01 +00:00
Andreas Gampe
a7f2bccca3
Merge "Frameworks/base: Refactor package manager" into nyc-dev
2016-03-24 01:59:24 +00:00
Joe LaPenna
f33b5bffee
Allow setting doze timeouts based on system feature
...
BUG: 25678232
Change-Id: Ic9c8e5001a9202242308effb38de879b5f30bd36
2016-03-23 18:48:59 -07:00
Andreas Gampe
bdd30d86ef
Frameworks/base: Refactor package manager
...
Introduce a mapping between dexopt reasons and compiler filters. Use
reasons in package manager and other classes, where possible.
Change PackageDexOptimizer to accept a compilation filter. Adapt for
the split-out profile merging. Pass compilation filter to installd.
Bug: 27689078
Change-Id: I8c0ea6f10fbfdbd096adecc52abfd2466d048fdc
2016-03-23 16:21:21 -07:00
Sharvil Nanavati
7f8d650ed7
Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
...
Change-Id: I48c0a7bc39e2efcc5b4120a4fa2ecf6dfd54ac27
2016-03-23 16:19:34 -07:00
Felipe Leme
541af9b119
Removed obsolete @NonNull.
...
BUG: 27676858
Change-Id: Ic3916769c1fa9d557294bcdbbc94e00c68376a5d
2016-03-23 16:05:57 -07:00
Chad Brubaker
1b55d74981
Merge "Properly handle whitespace in domain entries" into nyc-dev
...
am: 2e6aa19
2016-03-23 22:50:01 +00:00
Chad Brubaker
2e6aa196bc
Merge "Properly handle whitespace in domain entries" into nyc-dev
2016-03-23 22:44:11 +00:00
Amith Yamasani
195ed1e61b
Merge "Localize owner\'s name to current locale until changed" into nyc-dev
...
am: df4c40d
2016-03-23 22:40:05 +00:00
