OSDN Git Service
Robert Berry [Thu, 11 Jan 2018 13:50:56 +0000 (13:50 +0000)]
Add #getTransportFlags to BackupDataOutput
This allows a BackupAgent to check whether the transport has client-side
encryption enabled. It can then use this information to decide whether
to back up more sensitive data.
Bug:
72299360
Test: Manually verified full & kv backup agents receive transport flags
Test: m -j RunFrameworksServicesRoboTests
Change-Id: Ibd9b5f9479815e1721e9d6b7663d892b9ab3fcae
Robert Berry [Thu, 25 Jan 2018 09:28:29 +0000 (09:28 +0000)]
Merge "Remove @hide from incremental flags & return code."
Przemyslaw Szczepaniak [Thu, 25 Jan 2018 09:20:18 +0000 (09:20 +0000)]
Merge "Warn when running activity from deprecated app (< min supported sdk)."
Nicolas Geoffray [Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)]
Merge "Rewrite handling of oob priv-apps in framework."
TreeHugger Robot [Thu, 25 Jan 2018 08:36:54 +0000 (08:36 +0000)]
Merge "keystore: Add Trusted User Presence (TUP) APIs."
nharold [Thu, 25 Jan 2018 07:59:57 +0000 (07:59 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder" am:
af3fb3efe4 am:
bbb4b05a64
am:
461aeb4689
Change-Id: Ic554e34d9b16f522156bc7e8b176f96693e8e32c
Chalard Jean [Thu, 25 Jan 2018 07:51:11 +0000 (07:51 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am:
a8452ed2a6 am:
806f0191d4
am:
16897eb4aa
Change-Id: I06a64bbfaa501f860d7078cb2cc6d9af60b57eb8
nharold [Thu, 25 Jan 2018 07:49:59 +0000 (07:49 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder" am:
af3fb3efe4
am:
bbb4b05a64
Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5
Chalard Jean [Thu, 25 Jan 2018 07:41:44 +0000 (07:41 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am:
a8452ed2a6
am:
806f0191d4
Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
nharold [Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"
am:
af3fb3efe4
Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604
TreeHugger Robot [Thu, 25 Jan 2018 07:34:33 +0000 (07:34 +0000)]
Merge "PackageManager: Add FEATURE_CAMERA_AR"
Chalard Jean [Thu, 25 Jan 2018 07:33:35 +0000 (07:33 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
am:
a8452ed2a6
Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
Allen Webb [Thu, 18 Jan 2018 16:34:45 +0000 (08:34 -0800)]
keystore: Add Trusted User Presence (TUP) APIs.
Test: m -j KeystoreTests && adb install -r
out/target/product/crosshatch/data/app/KeystoreTests/KeystoreTests.apk
adb shell am instrument
'android.security.tests/android.support.test.runner.AndroidJUnitRunner'
Bug:
72476834
Change-Id: I61ee4326a5e31f1cefacd47470b53634fa94c2ef
TreeHugger Robot [Thu, 25 Jan 2018 06:52:42 +0000 (06:52 +0000)]
Merge "Set ActivityView background to current top task's color"
TreeHugger Robot [Thu, 25 Jan 2018 06:47:29 +0000 (06:47 +0000)]
Merge "Adding guardrails on writing to disk from statsd"
TreeHugger Robot [Thu, 25 Jan 2018 06:43:17 +0000 (06:43 +0000)]
Merge "Temporarily disable swipe up onboarding"
TreeHugger Robot [Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)]
Merge "Statsd broadcast subscriber"
nharold [Thu, 25 Jan 2018 05:50:33 +0000 (05:50 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"
TreeHugger Robot [Thu, 25 Jan 2018 05:41:21 +0000 (05:41 +0000)]
Merge "Fix start/pause behavior for AnimatedImageDrawable"
Chalard Jean [Thu, 25 Jan 2018 05:39:06 +0000 (05:39 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
Chalard Jean [Thu, 25 Jan 2018 05:37:21 +0000 (05:37 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
TreeHugger Robot [Thu, 25 Jan 2018 05:20:46 +0000 (05:20 +0000)]
Merge "Re-commit: Add accessibility support for tooltips"
Chalard Jean [Thu, 25 Jan 2018 00:41:51 +0000 (09:41 +0900)]
Fix a bug where a NetworkAgent gets repeatedly torn down
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.
Bug:
72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
and seems not to break phone networking
Cherry-pick of : Id2bbf3808e80b19cd055c832c11cf72372710942
Change-Id: I4b88d5eccbdea745a947d12635cd751e38632589
Chalard Jean [Thu, 25 Jan 2018 00:41:51 +0000 (09:41 +0900)]
Fix a bug where a NetworkAgent gets repeatedly torn down
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.
Bug:
72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
and seems not to break phone networking
Change-Id: Id2bbf3808e80b19cd055c832c11cf72372710942
TreeHugger Robot [Thu, 25 Jan 2018 04:50:27 +0000 (04:50 +0000)]
Merge "Exempting allow-while-idle alarms in EBS"
TreeHugger Robot [Thu, 25 Jan 2018 04:46:39 +0000 (04:46 +0000)]
Merge changes from topic "carrier_net_notifier"
* changes:
Adds SystemMessage for CarrierNetworkNotification
Carrier Network Notification strings
Carrier Network Available Notification setting
TreeHugger Robot [Thu, 25 Jan 2018 04:34:51 +0000 (04:34 +0000)]
Merge "Remove TODO of won't fix bug."
Howard Ro [Thu, 25 Jan 2018 04:32:50 +0000 (04:32 +0000)]
Merge "Revert "Revert "Revert "Enable init.rc for statsd to start statsd by default in boot time""""
Kevin Chyn [Thu, 25 Jan 2018 04:31:26 +0000 (04:31 +0000)]
Merge "Add a11y descriptions for FingerprintDialog"
Victor Hsieh [Thu, 25 Jan 2018 04:24:06 +0000 (04:24 +0000)]
Merge "Fix fsverity format"
TreeHugger Robot [Thu, 25 Jan 2018 04:23:38 +0000 (04:23 +0000)]
Merge "Introduce InputConnection#reportLanguageHint()"
Jeremy Klein [Thu, 25 Jan 2018 03:54:26 +0000 (03:54 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." am:
f4dc715575 am:
4c2c7bedf9
am:
2eee5f20f0
Change-Id: I91617ffeb287317ecf50ceda6cd85ef438faf29f
TreeHugger Robot [Thu, 25 Jan 2018 03:49:19 +0000 (03:49 +0000)]
Merge "Determine the multipath hint from data usage."
Jeremy Klein [Thu, 25 Jan 2018 03:44:46 +0000 (03:44 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." am:
f4dc715575
am:
4c2c7bedf9
Change-Id: I5d214df392ed17c7de0456f535f9b550485c8fc2
Jun Yin [Thu, 25 Jan 2018 03:42:45 +0000 (03:42 +0000)]
Merge "Adds stripTrailingFs" am:
27bb333e14 am:
a91491a3b8
am:
76e05493b4
Change-Id: Ie4c5994131a97b9acbe445abef3f4c6e73009732
Jeremy Klein [Thu, 25 Jan 2018 03:35:06 +0000 (03:35 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
am:
f4dc715575
Change-Id: I1f603f966aeb5d828746969295f51e2f01096bc4
Jun Yin [Thu, 25 Jan 2018 03:34:13 +0000 (03:34 +0000)]
Merge "Adds stripTrailingFs" am:
27bb333e14
am:
a91491a3b8
Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef
Nathan Harold [Thu, 7 Dec 2017 03:12:28 +0000 (19:12 -0800)]
Move Keepalive out of IpSecTransform.Builder
The lifecycle of Keepalive offloading is, unfortunately
different from that of an IpSecTransform. Because starting
a keepalive is fundamentally asynchronous, and isn't valid
until after a transform exists, it will now be a separate
optional procedure that may succeed or fail. It remains
linked with a Transform by the need for a Transform to exist
in order to initiate a Keepalive.
Bug:
38350389
Test: compilation
Change-Id: Ia76fccee41f86d694dff436043293d0c0762c041
Winson Chung [Thu, 25 Jan 2018 03:31:30 +0000 (03:31 +0000)]
Merge changes Ib57ea73f,I5cbd21ed,Id32f03c7,I131df87f
* changes:
4/ Update SysUI shared lib for Recents transition
3/ Add input consumer to capture touches during a Recents transition
2/ Add support for remote Recents animation
1/ Create display content window controller to position stacks in the display
Amit Mahajan [Thu, 25 Jan 2018 03:29:29 +0000 (03:29 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am:
7b9a785d65 am:
e2075c2c7d
am:
fd8df8236f
Change-Id: I9590dbc72f27180e3f6e6efed1dea776074ed025
Jun Yin [Thu, 25 Jan 2018 03:27:05 +0000 (03:27 +0000)]
Merge "Adds stripTrailingFs"
am:
27bb333e14
Change-Id: I355be2bb0b23e69103edc073ffe3adb757e57aa9
Tyler Gunn [Thu, 25 Jan 2018 03:21:03 +0000 (03:21 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
Winson Chung [Thu, 18 Jan 2018 17:32:47 +0000 (09:32 -0800)]
4/ Update SysUI shared lib for Recents transition
- Ensures that we cancel the recents animation when handling touch
- Moving InputConsumerController to shared lib
- Add compat classes for recents controller/listener
Bug:
70180552
Test: Manual, swipe up with suitable launcher build
Change-Id: Ib57ea73ff75545b91922df188ffb7152e9d4cebd
Winson Chung [Thu, 18 Jan 2018 17:31:12 +0000 (09:31 -0800)]
3/ Add input consumer to capture touches during a Recents transition
Bug:
70180552
Test: go/wm-smoke
Test: Manual, swipe up with suitable launcher build
Change-Id: I5cbd21ed13fdce1a5dbf8ff8bfb48dc263c7a54d
Treehugger Robot [Thu, 25 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
Andreas Gampe [Thu, 25 Jan 2018 03:04:07 +0000 (03:04 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning" am:
25e50ccccb am:
822e828971
am:
9c6acbd248
Change-Id: I4846f6b91fadbbd650e925c70215dea4d4459278
Amit Mahajan [Thu, 25 Jan 2018 02:59:04 +0000 (02:59 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am:
7b9a785d65
am:
e2075c2c7d
Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
Suprabh Shukla [Sat, 20 Jan 2018 00:43:35 +0000 (16:43 -0800)]
Exempting allow-while-idle alarms in EBS
Exempting allow-while-idle alarms when the device is in Extreme battery
saver. The throttling of one allow-while-idle alarm per
ALLOW_WHILE_IDLE_LONG_TIME is applied even when the device may not be
dozing. The throttling is relaxed to ALLOW_WHILE_IDLE_SHORT_TIME if the
uid was in the foreground recently.
Test: atest android.alarmmanager.cts.BatterySaverTests
Bug:
72124522
Change-Id: Ic75bac6234745c73a345180387c83bc725823aa8
TreeHugger Robot [Thu, 25 Jan 2018 02:49:35 +0000 (02:49 +0000)]
Merge "Clear parent wants focus on strong focus gain."
Andreas Gampe [Thu, 25 Jan 2018 02:48:37 +0000 (02:48 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning" am:
25e50ccccb
am:
822e828971
Change-Id: I0481e40c91e5848fc7ab551a794269d9379cbcc9
Chong Zhang [Thu, 25 Jan 2018 02:47:59 +0000 (02:47 +0000)]
Merge "MediaCodec: expose constant quality mode"
Treehugger Robot [Thu, 25 Jan 2018 02:44:26 +0000 (02:44 +0000)]
Merge "Adds stripTrailingFs"
Amit Mahajan [Thu, 25 Jan 2018 02:44:09 +0000 (02:44 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
am:
7b9a785d65
Change-Id: I3f329aea9d90ced822c119f079d0a70a562f44a3
Andreas Gampe [Thu, 25 Jan 2018 02:40:28 +0000 (02:40 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
am:
25e50ccccb
Change-Id: I085cfc11effb8f067bd8fc122ec88bd6c44a2525
Mehdi Alizadeh [Fri, 19 Jan 2018 03:34:15 +0000 (19:34 -0800)]
Adds SystemMessage for CarrierNetworkNotification
Adds a separate field in SystemMessage class for Carrier Network
Notification, to be able to differentiate between Carrier and Open
network notifications in case we have both notifications at the same
time.
Bug:
69310016
Test: Builds successfully
Change-Id: I5c4f40640a924e39cf4c6a33825afcc1a5c9d4f9
Glen Kuhne [Wed, 29 Nov 2017 00:01:02 +0000 (16:01 -0800)]
Carrier Network Notification strings
Added a title string for carrier network notifications.
Bug:
69310016
Test: builds
Change-Id: Ie00d84f209899783e459d3b36b34fec87c52872a
Glen Kuhne [Tue, 28 Nov 2017 22:06:25 +0000 (14:06 -0800)]
Carrier Network Available Notification setting
Adds a setting allowing user to toggle Carrier Network Available
Notification on and off.
Bug:
69310016
Test: Verified manually
Change-Id: I209cd216dd5fd5c790aca8f74707a7ef831edd6a
Tony Wickham [Thu, 25 Jan 2018 02:11:11 +0000 (18:11 -0800)]
Temporarily disable swipe up onboarding
Test: manual
Change-Id: Idfccfec7563a81d6e6b19cdbf961bc54a0ca9dd1
TreeHugger Robot [Thu, 25 Jan 2018 02:05:30 +0000 (02:05 +0000)]
Merge changes from topic "assetmanager-refactor"
* changes:
libandroidfw: Improve performance of AssetManager2
libandroidfw: Add ApplyStyle and SetConfiguration benchmark
Make idiomatic use of ApkAssets and AssetManager
Replace AssetManager with AssetManager2 implementation
TreeHugger Robot [Thu, 25 Jan 2018 02:04:11 +0000 (02:04 +0000)]
Merge "Add statsd microbenchmark and fix a crash in LogEvent"
Howard Ro [Thu, 25 Jan 2018 02:00:35 +0000 (02:00 +0000)]
Revert "Revert "Revert "Enable init.rc for statsd to start statsd by default in boot time"""
This reverts commit
b00cce84d9ddba04a3ebd5ed45457c1e154be535.
Reason for revert: b/
72459151
Change-Id: I71593b4b323d69edb548dcb1bb0e1f4eb7cddbc9
TreeHugger Robot [Thu, 25 Jan 2018 01:49:22 +0000 (01:49 +0000)]
Merge "Add flag to SysUI for Hybrid notification"
Treehugger Robot [Thu, 25 Jan 2018 01:33:33 +0000 (01:33 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
TreeHugger Robot [Thu, 25 Jan 2018 01:31:34 +0000 (01:31 +0000)]
Merge changes I8d43f5bc,I5ca4b0ca
* changes:
OMS: Enable uninstallation of overlays
PackageManager: allow overlays to be installed when signature matches platform cert
David Brazdil [Thu, 25 Jan 2018 01:20:47 +0000 (01:20 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am:
50cfaa40ca am:
97a970e56b
am:
5fab14313b
Change-Id: I788ad36976b6c63670f40c735380982e6567df86
David Brazdil [Thu, 25 Jan 2018 01:12:33 +0000 (01:12 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am:
50cfaa40ca
am:
97a970e56b
Change-Id: I73eaa052597d225aa673dd479977b0ce7a7d6d64
David Brazdil [Thu, 25 Jan 2018 01:06:15 +0000 (01:06 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
am:
50cfaa40ca
Change-Id: I7aa3c86bae54b4f55cbb5cfe8ddf076fedf6177b
Ningyuan Wang [Thu, 25 Jan 2018 01:03:15 +0000 (01:03 +0000)]
Merge "Remove WifiManager 'scanWithTraffic' APIs"
Winson Chung [Wed, 17 Jan 2018 00:22:35 +0000 (16:22 -0800)]
2/ Add support for remote Recents animation
- Allow the recents component to drive the animation from an app into
Recents using the remote animation framework. When initialized, the
animation repositions the recents activity behind the currently visible
tasks and provides the set of surface controls for the visible tasks.
Once complete, the recents component notifies the system whether it
has completed the animation into the recents activity, or whether it
should restore the previous state. In addition, there is a prescribed
delay after which the system automatically cancels the recents animation.
Bug:
70180552
Test: go/wm-smoke
Test: Manual, swipe up with suitable launcher build
Change-Id: Id32f03c7ad2288dce06231cfaa4b21916da511d7
Winson Chung [Thu, 18 Jan 2018 18:58:18 +0000 (10:58 -0800)]
1/ Create display content window controller to position stacks in the display
Bug:
70180552
Test: Existing ActivityStackTests pass
Test: go/wm-smoke
Change-Id: I131df87f4ff6903bd15e40d029bb0798ee024ab0
Mukesh Agrawal [Thu, 25 Jan 2018 00:59:47 +0000 (00:59 +0000)]
Merge changes I72baa5ca,I0366341a
* changes:
WifiConfiguration: deprecate WPA-1 related fields
WifiConfiguration: deprecate WEP-related fields
Andreas Gampe [Thu, 25 Jan 2018 00:56:11 +0000 (00:56 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
Nathan Harold [Thu, 25 Jan 2018 00:48:43 +0000 (00:48 +0000)]
Merge changes from topic "keepalive-on-cell"
* changes:
Rework KeepalivePacketData for Compatibility with Cell
Add Constants for NATT Keepalive to RILConstants
Relocate KeepalivePacketData to frameworks/base
Beverly Tai [Thu, 25 Jan 2018 00:47:07 +0000 (00:47 +0000)]
Merge "QS DND tile secondary text added"
Leif Wilden [Thu, 25 Jan 2018 00:35:26 +0000 (00:35 +0000)]
Merge "Unrevert "Move instrumentation classes to SettingsLib to share between mobile/TV."""
Lingfeng Yang [Thu, 25 Jan 2018 00:31:34 +0000 (00:31 +0000)]
Merge "Don't use shader disk cache on emulator"
Victor Hsieh [Thu, 25 Jan 2018 00:25:16 +0000 (00:25 +0000)]
Merge "Enable verity to updated priv app if root hash exists"
Victor Hsieh [Wed, 24 Jan 2018 20:06:43 +0000 (12:06 -0800)]
Fix fsverity format
This change also contains a workaround that ByteBuffer#put(byte)
sometimes does not work at all. See comments.
Test: saw correct debugging output of struct in dmesg.
Bug:
30972906
Bug:
72459251
Change-Id: I54553a8f20b8ef01c81c648f9aa588d28ab5eea5
Tyler Gunn [Mon, 22 Jan 2018 23:17:54 +0000 (15:17 -0800)]
Add handover permission, fill in some missing API gaps.
Adding the ACCEPT_HANDOVER runtime permission which an app must have in
order to accept handovers (this is per design).
Adding missing onHandoverComplete method in the android.telecom.Connection
API (per design).
Finishing plumbing for android.telecom.Call#onHandoverComplete API.
Fix issue where the new handover API methods would never get called; the
legacy handover extra was being used in this case when it should not have
been.
Bug:
65415068
Test: Verified using new CTS tests
Change-Id: If1558f6a23911862c02ac5b18fb62d86911ed7e2
Evan Rosky [Thu, 25 Jan 2018 00:08:03 +0000 (00:08 +0000)]
Merge "Expose selector draw condition for test"
TreeHugger Robot [Wed, 24 Jan 2018 23:57:47 +0000 (23:57 +0000)]
Merge "MAC Randomization: Store Randomized MAC Address in WifiConfiguration"
Calin Juravle [Wed, 24 Jan 2018 23:48:18 +0000 (23:48 +0000)]
Merge "Accept UserHandle.USER_ALL during profile preparation"
Jeremy Klein [Wed, 24 Jan 2018 23:46:11 +0000 (23:46 +0000)]
Merge "Add scan interval and window lengths to Settings.Global." am:
d3dac85e46 am:
8c33c789ed
am:
4ec192fd26
Change-Id: Ieae2e96acac3f1372d4075145426065f666a221a
Android Build Merger (Role) [Wed, 24 Jan 2018 23:38:15 +0000 (23:38 +0000)]
Merge "Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2 am:
596c22a84d am:
07b212b788"
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:37:16 +0000 (23:37 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2 am:
596c22a84d
am:
07b212b788
Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819
TreeHugger Robot [Wed, 24 Jan 2018 23:36:19 +0000 (23:36 +0000)]
Merge "ActivityManager: add API for wifi bug report"
Jeremy Klein [Wed, 24 Jan 2018 23:34:38 +0000 (23:34 +0000)]
Merge "Add scan interval and window lengths to Settings.Global." am:
d3dac85e46
am:
8c33c789ed
Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
Steven Moreland [Wed, 24 Jan 2018 23:32:38 +0000 (23:32 +0000)]
Merge "Allow HIDL to be used in priv-apps."
Pankaj Kanwar [Wed, 24 Jan 2018 23:27:27 +0000 (23:27 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev am:
e2bc2efe3c
am:
43a3671a42 -s ours
Change-Id: Ie98d1e6aee39427d2ec87dcea50aed9bf0ead023
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:24:29 +0000 (23:24 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2
am:
596c22a84d
Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac
Tobias Thierer [Wed, 24 Jan 2018 23:19:33 +0000 (23:19 +0000)]
Merge "Deprecate android.util.Mutable*."
Adam Lesinski [Tue, 9 Jan 2018 01:38:30 +0000 (17:38 -0800)]
libandroidfw: Improve performance of AssetManager2
AssetManager2 relied on creating a list of configurations
present in the resource table so as to avoid copying and
converting ResTable_config's from the APK on every
resource retrieval.
ResTable, however, had a better optimization that pruned
the configurations that didn't match the currently set
configuration. This vastly reduced the number of ResTable_configs
to test.
In this CL, AssetManager2 follows suite with this optimization
and only maintains the filtered ResTable_configs, falling back
to the slow path when the configuration is overridden.
Test: mma frameworks/base/libs/androidfw
Test: adb sync system data
Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks
Change-Id: I5d46f8b005a37b72750d00bd75f090e7b5a36f60
Adam Lesinski [Thu, 28 Dec 2017 21:01:35 +0000 (13:01 -0800)]
libandroidfw: Add ApplyStyle and SetConfiguration benchmark
Test: mma frameworks/base/libs/androidfw
Test: adb sync system data
Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks
Change-Id: Ia6b441f186ccb455acbee15723f0d2d5657b09b5
Adam Lesinski [Sat, 2 Dec 2017 02:22:37 +0000 (18:22 -0800)]
Make idiomatic use of ApkAssets and AssetManager
Move away from using deprecated addAssetPath methods
and cache the instances of ApkAssets created.
Test: CTS passes
Change-Id: I257c72261a97e4aa802abb46dc1f44d80e1d42ad
Adam Lesinski [Mon, 23 Jan 2017 20:58:11 +0000 (12:58 -0800)]
Replace AssetManager with AssetManager2 implementation
Test: atest CtsContentTestCases:android.content.res.cts
Test: make libandroidfw_tests
Change-Id: I572eb13c6a4372c7f656f5912821cececd5bf3d4
Pankaj Kanwar [Wed, 24 Jan 2018 23:14:30 +0000 (23:14 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
am:
e2bc2efe3c
Change-Id: Ie1366ad3364176dce6a5f7b5a78a19b7806030cd
Jeremy Klein [Wed, 24 Jan 2018 23:13:31 +0000 (23:13 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
am:
d3dac85e46
Change-Id: Ibae30208c4f0f2ad8bf8e508778d73f0883ef42e
Chong Zhang [Mon, 22 Jan 2018 23:40:38 +0000 (15:40 -0800)]
MediaCodec: expose constant quality mode
Also fix a bug where the supported bitcontrol mode
bitmask is wrong.
bug:
63633199
Change-Id: Ib2c21b0d846bcc31f61027d875f801a2282c1101
Derek Sollenberger [Wed, 24 Jan 2018 23:09:53 +0000 (23:09 +0000)]
Merge "Fix bug in ImageDecoder which provided the incorrect density to NinePatchDrawables"
Treehugger Robot [Wed, 24 Jan 2018 23:09:28 +0000 (23:09 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"