OSDN Git Service
TreeHugger Robot [Tue, 27 Feb 2018 22:39:15 +0000 (22:39 +0000)]
Merge "Small fixes to StatsManager API."
TreeHugger Robot [Tue, 27 Feb 2018 22:26:30 +0000 (22:26 +0000)]
Merge "ConfirmationDialog: Pass accessibility options and implement isSupported()."
Alan Viverette [Tue, 27 Feb 2018 22:08:31 +0000 (22:08 +0000)]
Merge "Revert "Follow prebuilt/API update""
Alan Viverette [Tue, 27 Feb 2018 20:12:41 +0000 (20:12 +0000)]
Revert "Follow prebuilt/API update"
This reverts commit
8aca4f00632959b0c9c04a893270843e561387dc.
Reason for revert: Required for prebuilt revert
Bug:
73903252
Bug:
73876473
Bug:
73875529
Bug:
73866916
Change-Id: I9be2f47458bfba97bacf34372752328c47a5ff9f
Jiuyu Sun [Tue, 27 Feb 2018 22:04:15 +0000 (22:04 +0000)]
Merge "Mark EUICC_PROVISIONED as @SystemApi."
TreeHugger Robot [Tue, 27 Feb 2018 22:03:00 +0000 (22:03 +0000)]
Merge "Use 4 thresholds instead of 6"
TreeHugger Robot [Tue, 27 Feb 2018 22:02:33 +0000 (22:02 +0000)]
Merge "Move mediadrm-related headers"
TreeHugger Robot [Tue, 27 Feb 2018 20:47:33 +0000 (20:47 +0000)]
Merge "Updates jank metrics in statsd to include uid."
TreeHugger Robot [Tue, 27 Feb 2018 20:42:37 +0000 (20:42 +0000)]
Merge "Update QS pagination dots color."
TreeHugger Robot [Tue, 27 Feb 2018 20:30:57 +0000 (20:30 +0000)]
Merge "Add a new API to import a key provided by the caller, such that this key can also be synced to the remote service"
Ajay Panicker [Tue, 27 Feb 2018 20:26:21 +0000 (20:26 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume" am:
affa54f01c am:
b351b63c2d
am:
5e87e7c983
Change-Id: I23070fd7f15e25ef2006bb43a5c8bd5dadec545f
Ajay Panicker [Tue, 27 Feb 2018 20:16:52 +0000 (20:16 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume" am:
affa54f01c
am:
b351b63c2d
Change-Id: Ifc18e2f82aba2239fefa7a4fe46d8bb9e9f1c0d9
TreeHugger Robot [Tue, 27 Feb 2018 20:14:29 +0000 (20:14 +0000)]
Merge "AAPT2: Fix issue with String flattening in XmlFlattener"
Ajay Panicker [Tue, 27 Feb 2018 20:07:49 +0000 (20:07 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume"
am:
affa54f01c
Change-Id: I48e7236ea475674b9e67defa6814e2d9fbb4cc2b
TreeHugger Robot [Tue, 27 Feb 2018 19:56:38 +0000 (19:56 +0000)]
Merge "Picture in picture Z ordering fixes."
TreeHugger Robot [Tue, 27 Feb 2018 19:51:27 +0000 (19:51 +0000)]
Merge "Mark all old RecoveryController APIs as deprecated"
Andrew Solovay [Tue, 27 Feb 2018 19:46:36 +0000 (19:46 +0000)]
Merge "docs: Adding P to the API levels"
TreeHugger Robot [Tue, 27 Feb 2018 19:44:20 +0000 (19:44 +0000)]
Merge "Add columns for snapshot table"
Andreas Gampe [Tue, 27 Feb 2018 19:39:51 +0000 (19:39 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
4d9bec6b4a am:
0e8e9472ba
am:
20f00dfe66
Change-Id: I0c611c22eedda2d849bd16ef2e2bb7e2e60e0a5a
TreeHugger Robot [Tue, 27 Feb 2018 19:30:31 +0000 (19:30 +0000)]
Merge "Remove unused RecoveryClaim file"
TreeHugger Robot [Tue, 27 Feb 2018 19:23:35 +0000 (19:23 +0000)]
Merge "Use audio_has_proportional_frames when setting up AudioTrack."
Andreas Gampe [Tue, 27 Feb 2018 19:19:01 +0000 (19:19 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
4d9bec6b4a
am:
0e8e9472ba
Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402
Andreas Gampe [Tue, 27 Feb 2018 19:07:49 +0000 (19:07 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
am:
4d9bec6b4a
Change-Id: I0c684a434a0f43fcae1a766c6c84a756115d9dcb
Chris Tate [Tue, 27 Feb 2018 19:02:06 +0000 (19:02 +0000)]
Merge "Deal with alarm times near MAX_VALUE"
TreeHugger Robot [Tue, 27 Feb 2018 18:57:49 +0000 (18:57 +0000)]
Merge "[Magnifier-27] Make it more prominent"
Treehugger Robot [Tue, 27 Feb 2018 18:44:23 +0000 (18:44 +0000)]
Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume"
Bryce Lee [Tue, 27 Feb 2018 18:32:49 +0000 (18:32 +0000)]
Merge "Revert "Always finish activity when moving to a destroyed state.""
TreeHugger Robot [Tue, 27 Feb 2018 18:25:14 +0000 (18:25 +0000)]
Merge "CameraServiceProxy: Add client API level to log metrics"
TreeHugger Robot [Tue, 27 Feb 2018 17:58:24 +0000 (17:58 +0000)]
Merge "Added more info. to exception while creating display in WM."
Annie Meng [Tue, 27 Feb 2018 17:39:58 +0000 (17:39 +0000)]
Merge "Move transport constant to BackupTransport API"
Jordan Liu [Mon, 26 Feb 2018 23:50:21 +0000 (15:50 -0800)]
Use 4 thresholds instead of 6
Min and max thresholds are fixed, and should not be customizable.
Bug:
73775507
Bug:
70698348
Test: manual test on 311480 and ServiceStateTrackerTest
Change-Id: Ie7fbda0627615f49b6205142c22ad48e88735f80
Treehugger Robot [Tue, 27 Feb 2018 17:30:23 +0000 (17:30 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test"
Ajay Panicker [Tue, 27 Feb 2018 00:04:15 +0000 (16:04 -0800)]
AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume
Use setAvrcpAbsoluteVolume() instead of adjustAvrcpAbsoluteVolume in
adjust stream volume in order to better sync device volume and remote
Bluetooth device volume. This will allow Bluetooth to avoid calculating
its own volume step size.
Bug:
68812037
Test: Connect to device that supports Absolute Volume and see that
volume changed occur when changing volume on device.
Change-Id: I26d5812ee1a5953b6527561ce5ad1c5d944c244d
TreeHugger Robot [Tue, 27 Feb 2018 17:21:27 +0000 (17:21 +0000)]
Merge "Docs: added a note about about notification listeners and work profiles."
Bo Zhu [Mon, 26 Feb 2018 23:54:25 +0000 (15:54 -0800)]
Add a new API to import a key provided by the caller, such that this key
can also be synced to the remote service
This API may be useful for backward-compatibility work, e.g., recovering
a key that's backed up in Android Q+ to Android P without updating the
Android P Frameworks code. This API may also be useful for other use cases.
Bug:
73785182
Change-Id: I1022dffb6a12bdf3df2022db5739169fcc9347d2
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Christine Franks [Tue, 27 Feb 2018 17:13:05 +0000 (17:13 +0000)]
Merge "Add DevicePolicyManager#setDefaultSmsApplication"
TreeHugger Robot [Tue, 27 Feb 2018 17:05:35 +0000 (17:05 +0000)]
Merge "Fix broken demo mode"
Bryce Lee [Tue, 27 Feb 2018 16:57:37 +0000 (08:57 -0800)]
Revert "Always finish activity when moving to a destroyed state."
This reverts commit
7ace395d65edb4764fc537ac1c9ed3c07bc72c33.
Fixes:
73900028
Change-Id: I8b72dca8e001413d54ab85be07943b6ebc451615
Todd Poynor [Tue, 27 Feb 2018 16:57:38 +0000 (16:57 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present" am:
e90cba2115 am:
f45d0cb962
am:
9f53412f2f -s ours
Change-Id: Iad550efe5140d1e9308942ed41dbb5cd58930c4f
TreeHugger Robot [Tue, 27 Feb 2018 16:50:27 +0000 (16:50 +0000)]
Merge "Some fixes for limited notifications"
Todd Poynor [Tue, 27 Feb 2018 16:44:28 +0000 (16:44 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present" am:
e90cba2115
am:
f45d0cb962
Change-Id: I4192f48a73098b1fc20cacccc6acfec2e40d8e99
Todd Poynor [Tue, 27 Feb 2018 16:33:11 +0000 (16:33 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present"
am:
e90cba2115
Change-Id: I451ea71fe64e3c309a8722a3d155453b1a609a8f
Wale Ogunwale [Tue, 27 Feb 2018 16:32:15 +0000 (08:32 -0800)]
Added more info. to exception while creating display in WM.
To help figure-out root cause of issue.
Bug:
72893961
Test: Builds
Change-Id: If1ae4f80f01490e2460b0a9db7a481fa2c0046e8
Zhi An Ng [Tue, 27 Feb 2018 16:24:50 +0000 (16:24 +0000)]
Merge "Revert "Log app start memory state in background""
Zhi An Ng [Tue, 27 Feb 2018 16:23:10 +0000 (16:23 +0000)]
Revert "Log app start memory state in background"
This reverts commit
6ff939a8f2e1b5e5b37033fb7295badcabdacf8f.
Reason for revert: Used stated data
Change-Id: Ib186d80dc23575278e4a58080f5ca4a555d3a2c1
Zhi An Ng [Tue, 27 Feb 2018 16:14:57 +0000 (16:14 +0000)]
Merge "Log app start memory state in background"
Amin Shaikh [Tue, 27 Feb 2018 16:13:31 +0000 (11:13 -0500)]
Update QS pagination dots color.
Bug:
73312177
Test: visual
Change-Id: I4072dc245fb525fdeef42d4334f96fa1f74c0ff7
TreeHugger Robot [Tue, 27 Feb 2018 16:11:02 +0000 (16:11 +0000)]
Merge changes I7ce670f5,I0bd2de38
* changes:
Preload with RELRO sharing in the WebView zygote.
Make WebViewLibraryLoader interface more flexible.
Treehugger Robot [Tue, 27 Feb 2018 15:24:28 +0000 (15:24 +0000)]
Merge "BackgroundDexOptService: skip low battery check if not present"
Annie Meng [Tue, 20 Feb 2018 12:06:56 +0000 (12:06 +0000)]
Move transport constant to BackupTransport API
Previously, the transport registration extra was a private
constant. Since GMSCore depends on this value being passed, moving
it to a public API prevents having to define it twice in
framework and GMSCore, and ensures compatibility between the two.
TODO: Update GMSCore with this constant once this drops
into GMSCore.
Bug:
72730566
Test: 1) m -j ROBOTEST_FILTER=TransportManagerTest RunFrameworksServicesRoboTests
2) m -j ROBOTEST_FILTER=TransportClientManagerTest RunFrameworksServicesRoboTests
Change-Id: I8f7a2ca0275047a5d3cc1a530cd86499d0170f2f
Bernardo Rufino [Tue, 27 Feb 2018 15:05:02 +0000 (15:05 +0000)]
Merge "More tests for ActiveRestoreSession"
Mihai Popa [Tue, 27 Feb 2018 14:25:52 +0000 (14:25 +0000)]
[Magnifier-27] Make it more prominent
When used on views with a dark background, the magnifier does not really
stand out from the view, which is potentially confusing for users. This
CL mixes the magnifier content with 5% white in order to make the
magnifier more prominent on dark backgrounds. Also, the CL increases the
elevation of the magnifier window, useful in light backgrounds.
Bug:
70608551
Test: manual testing
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: I7c6e4418b49b7fe0d69344668fa66d39417b4ecc
TreeHugger Robot [Tue, 27 Feb 2018 13:53:18 +0000 (13:53 +0000)]
Merge "Add prefix to ImageDecoder.Allocator"
TreeHugger Robot [Tue, 27 Feb 2018 13:49:27 +0000 (13:49 +0000)]
Merge "Elevate remote/recents animation priority"
TreeHugger Robot [Tue, 27 Feb 2018 12:43:38 +0000 (12:43 +0000)]
Merge "Clean up RecoveryController imports"
Bernardo Rufino [Mon, 26 Feb 2018 14:07:01 +0000 (14:07 +0000)]
More tests for ActiveRestoreSession
Around restoreAll() and restoreSome(). And some small refactorings in
restore code paths.
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I0ff446ef4dcf15eade189c79e90a22c0f2eda0d6
Neil Fuller [Tue, 27 Feb 2018 12:18:59 +0000 (12:18 +0000)]
Merge "Remove icu4j dependency." am:
6963081c5b am:
794be8d45f
am:
f2b27fc624 -s ours
Change-Id: I3a1f04d39b3d76e1ef3f43d0d09f696fdf3aeda2
Neil Fuller [Tue, 27 Feb 2018 12:10:48 +0000 (12:10 +0000)]
Merge "Remove icu4j dependency." am:
6963081c5b
am:
794be8d45f
Change-Id: Idd805b56e75dab3c586847b5fdc9eaf8db248d58
Neil Fuller [Tue, 27 Feb 2018 12:04:25 +0000 (12:04 +0000)]
Merge "Remove icu4j dependency."
am:
6963081c5b
Change-Id: Ifc8cd0946bd069837fb46f3f8f9d85df715ab4de
Benjamin Miller [Tue, 27 Feb 2018 11:29:16 +0000 (11:29 +0000)]
Docs: added a note about about notification listeners and work profiles.
Stated that NotificationListenerService is ignored when running in the work profile.
A NotificationListenerService might not see notifications from the work profile if an IT admin blocks personal apps.
Staged at:
http://go/dac-stage/reference/android/service/notification/NotificationListenerService.html
Test: Run make ds-docs and review
Bug:
67907973
Change-Id: Ie37cf8f576dc228e6c8ba074f389595fdebcdf9c
TreeHugger Robot [Tue, 27 Feb 2018 11:13:21 +0000 (11:13 +0000)]
Merge "Make FooterPreference.KEY_FOOTER public"
Robert Berry [Mon, 26 Feb 2018 16:23:27 +0000 (16:23 +0000)]
Remove unused RecoveryClaim file
This is not part of the API so not sure why it's even in the package.
Test: manual
Change-Id: Ie970d2801d84719126e5d2e90351b14655f9e6f3
Robert Berry [Mon, 26 Feb 2018 16:31:01 +0000 (16:31 +0000)]
Mark all old RecoveryController APIs as deprecated
Test: none, no functionality changed
Change-Id: I0ff1d169b1597bf6e4447f52b0685874e7ec3745
Robert Berry [Mon, 26 Feb 2018 16:37:06 +0000 (16:37 +0000)]
Clean up RecoveryController imports
Some code is still importing constants from the deprecated old API.
Test: manual
Change-Id: I7a9e7e25c21641294c7af18bf2f83543f425edb2
Treehugger Robot [Tue, 27 Feb 2018 10:41:12 +0000 (10:41 +0000)]
Merge "Remove icu4j dependency."
TreeHugger Robot [Tue, 27 Feb 2018 10:24:28 +0000 (10:24 +0000)]
Merge "Refactor KernelUidCpuTimeReader"
Jack He [Tue, 27 Feb 2018 10:15:40 +0000 (10:15 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices" am:
5a8339c9a5 am:
e6ddc3e436
am:
3788976308
Change-Id: I387c8865b252c4fb4ad23732418d61fbd53f7845
Jack He [Tue, 27 Feb 2018 10:03:56 +0000 (10:03 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices" am:
5a8339c9a5
am:
e6ddc3e436
Change-Id: I67b90b63ca88d912b81f869fce5def24c09d5f72
Jack He [Tue, 27 Feb 2018 09:54:44 +0000 (09:54 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices"
am:
5a8339c9a5
Change-Id: I87d763899661fa0f4c1eb32ed0c2fac9a88355a3
Neil Fuller [Tue, 27 Feb 2018 09:26:44 +0000 (09:26 +0000)]
Merge "Remove icu4j dependency."
TreeHugger Robot [Tue, 27 Feb 2018 09:03:21 +0000 (09:03 +0000)]
Merge "Block am switch-user when user switching is disallowed"
Treehugger Robot [Tue, 27 Feb 2018 08:41:43 +0000 (08:41 +0000)]
Merge "Bluetooth: Add config value for max connected audio devices"
Jin Seok Park [Tue, 27 Feb 2018 08:00:30 +0000 (08:00 +0000)]
Merge "MediaControlView2: Hide API for customization"
TreeHugger Robot [Tue, 27 Feb 2018 07:18:30 +0000 (07:18 +0000)]
Merge "Remove internal links from ActivityManagerPerfTests README"
TreeHugger Robot [Tue, 27 Feb 2018 07:00:45 +0000 (07:00 +0000)]
Merge "Atom: TemperatureReported"
TreeHugger Robot [Tue, 27 Feb 2018 06:25:24 +0000 (06:25 +0000)]
Merge "Rename Private DNS mode Opportunistic to Automatic"
Jack He [Tue, 27 Feb 2018 05:04:31 +0000 (21:04 -0800)]
Bluetooth: Add config value for max connected audio devices
Bug:
64767509
Test: read config values in Bluetooth app
Change-Id: Ia5dd2fc1c16272082f11ac886e02b838575ceedd
TreeHugger Robot [Tue, 27 Feb 2018 05:32:53 +0000 (05:32 +0000)]
Merge "Fix bug in clearing a11y focus"
Etan Cohen [Tue, 27 Feb 2018 05:24:02 +0000 (05:24 +0000)]
Merge "[RTT] Fix legacy RTT API"
Tej Singh [Fri, 16 Feb 2018 08:15:09 +0000 (00:15 -0800)]
Atom: TemperatureReported
Makes the temperature reported atom pulled, and adds CPU, GPU, and SKIN
temperatures. Pulls information from the thermal hal.
Test: CTS test on cl in this topic
Change-Id: I0a8e2d1135bdd77e1cc510f24ff5214ce9e14ead
TreeHugger Robot [Tue, 27 Feb 2018 04:42:49 +0000 (04:42 +0000)]
Merge "Fix ConcurrentModificationException"
Mohamed Abdalkader [Tue, 27 Feb 2018 04:22:47 +0000 (04:22 +0000)]
Merge "Add more sms error codes" am:
c16da498d5 am:
8a9d38fbbc
am:
55295f2d0c
Change-Id: I63e8d4ea85aeda6927418bf42362397fa8e7ffb7
Phil Weaver [Tue, 27 Feb 2018 04:13:57 +0000 (04:13 +0000)]
Merge "Update A11y action serialization to use longs"
Mohamed Abdalkader [Tue, 27 Feb 2018 04:11:32 +0000 (04:11 +0000)]
Merge "Add more sms error codes" am:
c16da498d5
am:
8a9d38fbbc
Change-Id: Idaecf961390d15987e9d5c93fb21a796da33d989
Mohamed Abdalkader [Tue, 27 Feb 2018 04:03:19 +0000 (04:03 +0000)]
Merge "Add more sms error codes"
am:
c16da498d5
Change-Id: Id19bb14ebea3b0124af3a5990613a15d8c2fa44c
TreeHugger Robot [Tue, 27 Feb 2018 03:23:30 +0000 (03:23 +0000)]
Merge "Add alarm info to QS Panel"
Treehugger Robot [Tue, 27 Feb 2018 02:48:31 +0000 (02:48 +0000)]
Merge "Add more sms error codes"
Mike Digman [Tue, 27 Feb 2018 02:48:19 +0000 (02:48 +0000)]
Merge "Add intro mode to rotate suggestion button"
Lucas Dupin [Tue, 27 Feb 2018 02:40:36 +0000 (02:40 +0000)]
Merge "Ignore rebroadcasts of ACTION_SIM_STATE_CHANGED"
TreeHugger Robot [Tue, 27 Feb 2018 02:29:17 +0000 (02:29 +0000)]
Merge changes I1c8b5638,Id9b2c57a
* changes:
Make equality check more robust for a11y button
Ensure nav bar contrast under magnification
TreeHugger Robot [Tue, 27 Feb 2018 02:19:26 +0000 (02:19 +0000)]
Merge "Make a11y shortcut robust to services w/no summary"
Naoyuki Konda [Tue, 27 Feb 2018 02:16:40 +0000 (02:16 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am:
d676c5c134 am:
1d2ddbb9ae
am:
5f676ad625
Change-Id: I33817c1902c72aac417865287d137f8e1e919480
TreeHugger Robot [Tue, 27 Feb 2018 02:13:46 +0000 (02:13 +0000)]
Merge "[Magnifier-26] Wire up frame callback for realsies"
Android Build Merger (Role) [Tue, 27 Feb 2018 02:10:26 +0000 (02:10 +0000)]
Merge "Merge "Frameworks: Annotate JUnit4 test with @Test" am:
3a12454f9a am:
af8f4b192d am:
b4654687ef"
Andreas Gampe [Tue, 27 Feb 2018 02:09:58 +0000 (02:09 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
3a12454f9a am:
af8f4b192d
am:
b4654687ef
Change-Id: I7904252d10121901349e49c62577a98f06355cba
Jaewan Kim [Tue, 27 Feb 2018 02:07:59 +0000 (02:07 +0000)]
Merge "MediaSession2: Unhide APIs"
Todd Poynor [Wed, 21 Feb 2018 04:11:43 +0000 (20:11 -0800)]
BackgroundDexOptService: skip low battery check if not present
If no battery is present, assume no need to check for low battery.
Do not interpret battery level values if battery is not present.
Bug:
34507420
Test: manual (temporary log messages with battery forced not present)
Change-Id: Iebc64bc890808d583d0bd95a31f17b6363b7ba40
Merged-In: Iebc64bc890808d583d0bd95a31f17b6363b7ba40
Naoyuki Konda [Tue, 27 Feb 2018 02:03:54 +0000 (02:03 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am:
d676c5c134
am:
1d2ddbb9ae
Change-Id: Ib137d185149dca4ae5117f6c32f610281960123a
Andreas Gampe [Tue, 27 Feb 2018 01:54:13 +0000 (01:54 +0000)]
Merge "Frameworks: Annotate JUnit4 test with @Test" am:
3a12454f9a
am:
af8f4b192d
Change-Id: Id390ce18897982a278b0b8b74650e45fa25e5a36
Naoyuki Konda [Tue, 27 Feb 2018 01:50:43 +0000 (01:50 +0000)]
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL"
am:
d676c5c134
Change-Id: Ie81e3f51647b866fbe1f6b2d0e93d5f3e7696837