OSDN Git Service
Dianne Hackborn [Wed, 14 Mar 2018 03:02:20 +0000 (03:02 +0000)]
Merge "Fix issue #
62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 02:48:57 +0000 (02:48 +0000)]
Merge "Display shortcut modifiers in menu" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 00:49:26 +0000 (00:49 +0000)]
Merge "Allow apps in /odm/app and /odm/priv-app (2/2)" into pi-dev
Hall Liu [Wed, 14 Mar 2018 00:37:37 +0000 (00:37 +0000)]
Merge "Add IntDef for MBMS download result" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 00:10:33 +0000 (00:10 +0000)]
Merge "Differentiate between automatic and manual brightness in metrics." into pi-dev
Ari Hausman-Cohen [Tue, 13 Mar 2018 23:09:51 +0000 (23:09 +0000)]
Merge "audioservice: add more properties for volume steps and default volumes" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 23:00:53 +0000 (23:00 +0000)]
Merge "DO NOT MERGE Fix French locale % escaping" into pi-dev
Qingxi Li [Tue, 13 Mar 2018 23:00:10 +0000 (23:00 +0000)]
Merge "Add API to check extended APDU Supported" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 22:54:30 +0000 (22:54 +0000)]
Merge "Fix NPE with null app window." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 22:44:21 +0000 (22:44 +0000)]
Merge "Revert "Camera: SessionConfiguration should use Executors"" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 22:24:51 +0000 (22:24 +0000)]
Merge "Transfer starting windows more aggressively" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 22:24:41 +0000 (22:24 +0000)]
Merge "Unhide getWeight of Typeface" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 21:56:52 +0000 (21:56 +0000)]
Merge "Revive old private api for saving supportlib-v27" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 21:55:30 +0000 (21:55 +0000)]
Merge "Add @attr for justificationMode" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 21:53:29 +0000 (21:53 +0000)]
Merge "Update AndroidTest to work with apct-suite setup" into pi-dev
Dianne Hackborn [Wed, 7 Mar 2018 20:42:47 +0000 (12:42 -0800)]
Fix issue #
62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi
Add a new platform-only permission for being able to change
app ops mode, so nothing outside of the platform can do this.
Bug:
62342672
Test: Booted, ran, settings works, shell works, apps install
Change-Id: I372e649c019a8f9b95919ff0da6f56612d7061c2
Howard Ro [Tue, 13 Mar 2018 21:38:16 +0000 (21:38 +0000)]
Merge "Add a check for duplicate configuration on statsd" into pi-dev
Brad Ebinger [Tue, 13 Mar 2018 21:26:36 +0000 (21:26 +0000)]
Merge "Remove unneeded notify AIDL API" into pi-dev
Lucas Dupin [Tue, 13 Mar 2018 18:40:32 +0000 (11:40 -0700)]
DO NOT MERGE Fix French locale % escaping
Test: adb shell dumpsys activity service com.android.systemui | grep compute
Change-Id: I75ed72e28f42dee3abbc09d0728fc8bac8c44829
Fixes:
74386188
TreeHugger Robot [Tue, 13 Mar 2018 20:57:49 +0000 (20:57 +0000)]
Merge "Remove stale string" into pi-dev
Yin-Chia Yeh [Tue, 13 Mar 2018 20:49:12 +0000 (20:49 +0000)]
Revert "Camera: SessionConfiguration should use Executors"
This reverts commit
004e73c38c799adfe5eaeceb96a5bc9aa3239b31.
Bug:
74605221
Bug:
73953366
Change-Id: I1665c3d235434f57a4cd4aa5f082720b83ac10cc
Brad Ebinger [Tue, 13 Mar 2018 20:53:53 +0000 (20:53 +0000)]
Merge "Support Dynamic ImsService Querying" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 20:51:53 +0000 (20:51 +0000)]
Merge "access bar notification rename" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 20:50:06 +0000 (20:50 +0000)]
Merge "Stop closing other dialogs when opening GlobalActions." into pi-dev
Qingxi Li [Wed, 7 Mar 2018 18:50:02 +0000 (10:50 -0800)]
Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported
Bug:
68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
Michael Wright [Tue, 13 Mar 2018 20:16:35 +0000 (20:16 +0000)]
Differentiate between automatic and manual brightness in metrics.
We want to make sure the trend for number of interactions with the
brightness slider goes down over time with automatic brightness enabled.
Rather than trying to correlate the setting and this metric, it's much
easier to just use a different metric.
Bug:
74610647
Test: Flash, see what gets logged
Change-Id: I9985de0c665e8d36bbe7416fe70f52098d6c2d50
TreeHugger Robot [Tue, 13 Mar 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Remove the UICC specific code from android.se.omapi" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 19:58:51 +0000 (19:58 +0000)]
Merge changes from topic "dnd_touch_sounds" into pi-dev
* changes:
DND touch sounds toggle does not toggle vibrations
Charging sounds won't play when dnd is on
Bryce Lee [Tue, 13 Mar 2018 19:46:03 +0000 (19:46 +0000)]
Merge "Ignore activity lifecycle requests without matching client records." into pi-dev
jdesprez [Tue, 13 Mar 2018 19:39:51 +0000 (12:39 -0700)]
Update AndroidTest to work with apct-suite setup
Updating the AndroidTest.xml to be picked up by the new
APCT suite setup.
Test: atest FrameworksCoreTests
Bug:
74440293
Change-Id: Ib1ca44ba29dc349ca372effc1586e1d3376bd549
TreeHugger Robot [Tue, 13 Mar 2018 19:37:25 +0000 (19:37 +0000)]
Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 19:20:47 +0000 (19:20 +0000)]
Merge "Expose the new brightness permissions as test APIs." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 19:18:42 +0000 (19:18 +0000)]
Merge "Catch the RuntimeException for stopScan()" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 19:01:40 +0000 (19:01 +0000)]
Merge "Add selectable text view perf test for random text" into pi-dev
fionaxu [Tue, 13 Mar 2018 01:26:05 +0000 (18:26 -0700)]
access bar notification rename
Bug:
37579161
Test: Build
Change-Id: I609826de47dc3fae4dee89d43951269a462c22b2
TreeHugger Robot [Tue, 13 Mar 2018 18:47:28 +0000 (18:47 +0000)]
Merge "Fix a bug when calling onError(int)" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 18:45:47 +0000 (18:45 +0000)]
Merge "Fixed flags when button that trigger autofill is clicked." into pi-dev
Seigo Nonaka [Tue, 13 Mar 2018 18:45:43 +0000 (11:45 -0700)]
Revive old private api for saving supportlib-v27
The method signature of the createFromFamiliesWithDefault is changed
for supporting multiple font fallback. The old method is used by
supportlib-v27.
Bug:
73981003
Test: Manually done
Change-Id: I45ee9975b0f15481b60362113b89d4a1bf5a5338
Brad Ebinger [Mon, 12 Mar 2018 18:13:26 +0000 (11:13 -0700)]
Remove unneeded notify AIDL API
Removes the notifyImsFeatureReady
API AIDL, it is called when the callback
is set on the specific ImsFeature
interface.
Bug:
74391574
Test: Manual
Merged-In: I4762bdef59a8adec8ce41972489c65f2d180a3d4
Change-Id: I8c9cc39fa73861d7a9792709e1517d391230abfa
Hall Liu [Tue, 13 Mar 2018 18:29:33 +0000 (11:29 -0700)]
Add IntDef for MBMS download result
Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619
Fixes:
74409057
Test: compiles, no functionality change
Lucas Dupin [Tue, 13 Mar 2018 18:26:07 +0000 (18:26 +0000)]
Merge "Show scrims when bouncer is on top of QS" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 18:21:46 +0000 (18:21 +0000)]
Merge "metrics for 'manage notifications' affordance." into pi-dev
Seigo Nonaka [Tue, 13 Mar 2018 18:17:54 +0000 (11:17 -0700)]
Add @attr for justificationMode
Bug:
74510862
Test: "m docs" then see TextView API docs.
Change-Id: I65b75232402d7ad52aba194e6e9def80c5486a18
TreeHugger Robot [Tue, 13 Mar 2018 18:16:37 +0000 (18:16 +0000)]
Merge "Moved VibrateHelper as a dependency" into pi-dev
Matthew Ng [Fri, 9 Mar 2018 21:42:18 +0000 (13:42 -0800)]
Moved VibrateHelper as a dependency
VibrateHelper is a dependency to minimize number of event listeners.
This is related to the change ag/
3711731.
Bug:
73942704
Test: manual, press home button when quick step is enabled
Change-Id: Ic982cd16d88224003aa53847daaa04372898ef22
yro [Tue, 13 Mar 2018 03:44:05 +0000 (20:44 -0700)]
Add a check for duplicate configuration on statsd
Bug:
74349901
Test: statsd_test, manual testing of functionality
Change-Id: Ia4e3e51bfe61f5f773cecadda23e53d24b768dc8
Brad Ebinger [Thu, 1 Mar 2018 21:05:59 +0000 (13:05 -0800)]
Support Dynamic ImsService Querying
1) Provide a "default" impl for MmTelFeature
instead of returning null.
2) Introduce a FeatureSlotPair, which maps a SIM
slot ID to a ImsFeature. This allows the ImsService
to provide which features it supports for multi-SIM
phones.
3) Pipe through ImsResolver state to help prevent IMS
operation when the ImsResolver is in the process of
figuring out feature capabilities.
Test: Telephony ImsService test app, telephony unit tests
Bug:
72642524
Merged-In: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
Change-Id: Idb95f7651af200026d62e8b29eaed30bc0ebc9d3
TreeHugger Robot [Tue, 13 Mar 2018 18:00:07 +0000 (18:00 +0000)]
Merge "Cutout: Add a multi cutout overlay" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 17:50:46 +0000 (17:50 +0000)]
Merge "[RTT] Update LCI/LCR documentation to refect to IEEE 802.11-2016 spec." into pi-dev
Winson Chung [Tue, 13 Mar 2018 00:57:06 +0000 (17:57 -0700)]
Fix NPE with null app window.
Bug:
73539971
Test: go/wm-smoke
Change-Id: I825db92c11bb1830c8ea0bd06b5ab47451230f55
TreeHugger Robot [Tue, 13 Mar 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Show the H+ icon in HSPA+ network" into pi-dev
Bryce Lee [Tue, 13 Mar 2018 17:06:21 +0000 (10:06 -0700)]
Allow for activities to resumed if keyguard is occluded.
A previous changelist enforced that activities would not be resumed
if the keyguard is locked. However, this prevents activities that
show above the keyguard from resuming.
This changelist adjusts this check to account for occlusion.
Fixes:
74585178
Test: Lock screen, fingerprint unlock, verify activity is resumed.
Test: Set alarm, lock screen, verify alarm shows above lock screen
resumed.
Change-Id: I9d26d6b667bb1679c373f36188a610a66d2f5b2d
TreeHugger Robot [Tue, 13 Mar 2018 16:59:52 +0000 (16:59 +0000)]
Merge "Add tests to prevent NPE regression." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 15:49:47 +0000 (15:49 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." into pi-dev
Jorim Jaggi [Tue, 13 Mar 2018 15:35:51 +0000 (15:35 +0000)]
Merge "Improve animation dump/logging" into pi-dev
Jorim Jaggi [Tue, 13 Mar 2018 15:34:52 +0000 (15:34 +0000)]
Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev
Julia Reynolds [Tue, 13 Mar 2018 14:58:43 +0000 (10:58 -0400)]
metrics for 'manage notifications' affordance.
Bug:
74075050
Test: make
Change-Id: Ic6f65338ca114385890ab3bfac801cc206e4ed6e
Bryce Lee [Fri, 9 Mar 2018 19:02:10 +0000 (11:02 -0800)]
Ignore activity lifecycle requests without matching client records.
Previously, changes were made to finish destroyed activities. This
prevented the code sending lifecycle requests to a non-existent
client record. However, there are scenarios where an activity can
be destroyed without being finished. Finishing these activities will
lead to side effects, such as the activity not being in history and
therefore not restored when navigated back to.
This changelist unlinks finishing from setting an activity's state to
destroyed. For now, we will suppress lifecycle requests client side
without matching records.
Fixes:
74403650
Fixes:
74409828
Bug:
71506345
Test: enable don't keep activities. navigate back and forth
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testRestoreFromKill
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testPausedWhenRecreatedFromInNonFocusedStack
Change-Id: I1b76a4758c3be27dc30ecac5ee56949a5b173754
Etan Cohen [Tue, 27 Feb 2018 22:09:39 +0000 (14:09 -0800)]
[RTT] Update LCI/LCR documentation to refect to IEEE 802.11-2016 spec.
Update API doc.
Bug:
73953299
Test: builds
Change-Id: I608f1bc631902baf76d9e21a6dd586b188fdfac1
TreeHugger Robot [Tue, 13 Mar 2018 14:18:30 +0000 (14:18 +0000)]
Merge "Add tests for TransportStats and some refactor" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 13:54:18 +0000 (13:54 +0000)]
Merge "Run slice callbacks on thread they come in on" into pi-dev
dalyk [Thu, 8 Mar 2018 21:25:48 +0000 (16:25 -0500)]
Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug:
71828272
Merged-In: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Merged-In: Id88a4e846ae50536ac7b1541cf10c1fad1b1eeca
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
(cherry picked from commit
99c5029b91f17c46acd219a317b48b3ac0fe9a90)
Jorim Jaggi [Fri, 9 Mar 2018 17:14:48 +0000 (18:14 +0100)]
Fix SafeActivityOptions construction in startActivityFromRecents
Otherwise we'll check the wrong permissions and try to boost
the wrong process.
Test: Open app from recents, make sure Launcher gets scheduled
as needed.
Bug:
73555925
Change-Id: I2d1a7d0c881c0182127a5b25dce0ab1a308d5e63
Adrian Roos [Tue, 13 Mar 2018 13:21:17 +0000 (13:21 +0000)]
Merge changes Iff142ccd,I724080ed into pi-dev
* changes:
Multi cutout: Fix IME navigation guard
Multi Cutout: Fix more cutout issues
Jorim Jaggi [Tue, 27 Feb 2018 14:05:21 +0000 (15:05 +0100)]
Improve animation dump/logging
Bug:
74220420
Test: go/wm-smoke
Test: adb shell dumpsys window during animation
Change-Id: Ib8bddb4f38ad4fe7a80315d3bfdac0a80aea4cc8
Jorim Jaggi [Thu, 1 Feb 2018 18:21:07 +0000 (19:21 +0100)]
Transfer starting windows more aggressively
We currently transfer starting windows when starting another
activity on top of the previous one. However, that's not enough:
Sometimes we also need to transfer back in case the one on top
finishes itself/gets hidden for other reasons.
This fixes an issue where some animations are aborted in the
middle of the animation because the trampoline activity contained
the starting window but then the trampoline activity was finished.
Test: go/wm-smoke
Test: Open Drive, Reopen Drive 100x
Test: Open Hangouts, Receive notification, open it, reopen
hangouts from launcher 100x
Test: AppWindowContainerControllerTests
Bug:
72301120
Change-Id: I6711ce0bc35de430aac03f7b8b39ceac26e595e7
TreeHugger Robot [Tue, 13 Mar 2018 12:17:30 +0000 (12:17 +0000)]
Merge "Volume UI updates" into pi-dev
Hyundo Moon [Tue, 13 Mar 2018 12:03:55 +0000 (12:03 +0000)]
Merge "MediaSession2: Replace PlaybackState2" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 11:00:25 +0000 (11:00 +0000)]
Merge "Ensure members are non-null in callback" into pi-dev
Leon Scroggins [Tue, 13 Mar 2018 10:40:25 +0000 (10:40 +0000)]
Merge "Encode F16 Bitmaps to 8-bit P3" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 10:24:15 +0000 (10:24 +0000)]
Merge "Use the correct drawable to badge user icon" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 10:22:28 +0000 (10:22 +0000)]
Merge "Atoms: Bluetooth" into pi-dev
Hyundo Moon [Wed, 7 Mar 2018 01:22:45 +0000 (10:22 +0900)]
MediaSession2: Replace PlaybackState2
This CL removes PlaybackState2 and replaces it with other APIs.
Bug:
74370608, Bug:
73971431
Test: Passed CTS
Change-Id: Ifa16b1d551957ab4bb06979ddf29b18772093035
Lucas Dupin [Mon, 12 Mar 2018 18:39:29 +0000 (11:39 -0700)]
Show scrims when bouncer is on top of QS
Test: visual
Change-Id: I09c37c8478e1c409854af837cabf7bb12c5de79b
Fixes:
74511816
Christofer Ã…kersten [Tue, 13 Mar 2018 04:30:06 +0000 (13:30 +0900)]
Ensure members are non-null in callback
Bug:
74570008
Test: runtest-cts-MediaComponents -r 100
Change-Id: I59590afae4e67fa8a90f8a7b4a6be58ce54e2806
Jovana Knezevic [Tue, 13 Mar 2018 05:26:21 +0000 (05:26 +0000)]
Merge "Removing the countdown timer and countdown progress bar from the Car User Picker." into pi-dev
Jaewan Kim [Tue, 13 Mar 2018 04:30:50 +0000 (04:30 +0000)]
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev
* changes:
MediaSession2: Implement add/remove/replacePlaylistItem()
MediaSession2: Implement update/getPlaylistMetadata()
MediaSession2: Implement get/setPlaylist()
TreeHugger Robot [Tue, 13 Mar 2018 04:09:33 +0000 (04:09 +0000)]
Merge "WindowState: Update mLastSurfaceInsets at creation time." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 04:08:33 +0000 (04:08 +0000)]
Merge "Limit the systemconfig tags allowed to vendors" into pi-dev
Kevin Chyn [Tue, 13 Mar 2018 04:06:27 +0000 (04:06 +0000)]
Merge "Update FingerprintDialog UI for landscape orientation" into pi-dev
Tej Singh [Sat, 10 Mar 2018 03:48:11 +0000 (19:48 -0800)]
Atoms: Bluetooth
Adds atom defininitions for some bluetooth atoms.
Logging will go in aosp. ag/
3668205 contained most of this change, but
is being split up and moved to pi-dev and aosp.
Bug:
74457175,
72320489
Test: build success on marlin
Change-Id: Ib14a74eabfab08bbae5d4d549244f1022e8c34f0
TreeHugger Robot [Tue, 13 Mar 2018 03:14:59 +0000 (03:14 +0000)]
Merge "Passing the TaskDescription to the IconLoader" into pi-dev
Jaewan Kim [Mon, 12 Mar 2018 09:04:17 +0000 (18:04 +0900)]
MediaSession2: Implement add/remove/replacePlaylistItem()
Bug:
73149584
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I29804f52eaca45de21fd66634e4eeee2c72a9a25
Jaewan Kim [Mon, 12 Mar 2018 01:49:28 +0000 (10:49 +0900)]
MediaSession2: Implement update/getPlaylistMetadata()
Bug:
74174649
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I3ac2dabfc7f532bf7d7262940e3dc309e97fd45a
Marco Nelissen [Tue, 13 Mar 2018 02:51:06 +0000 (02:51 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174 am:
b3f50c9ccb -s ours am:
b50ae71d99 -s ours
am:
21e5aeefce -s ours
Change-Id: Ib0d77d48f378c8fc345c3c50e2be8d41cd4b28db
Jaewan Kim [Thu, 8 Mar 2018 13:17:11 +0000 (22:17 +0900)]
MediaSession2: Implement get/setPlaylist()
Bug:
74326040
Test: Run CtsMediaTests for MediaSession2
Change-Id: Ib799c03edd2f79c6f9ffa989aea1137018ec55b3
TreeHugger Robot [Tue, 13 Mar 2018 02:40:26 +0000 (02:40 +0000)]
Merge "Do not darken scrims when unlocking with fp" into pi-dev
Marco Nelissen [Tue, 13 Mar 2018 02:29:45 +0000 (02:29 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174 am:
b3f50c9ccb -s ours
am:
b50ae71d99 -s ours
Change-Id: Ic18f8e6449d4310924bac6a40acff9df4d743dc6
TreeHugger Robot [Tue, 13 Mar 2018 02:29:25 +0000 (02:29 +0000)]
Merge "heif: add option for specifying bitmap pixel format" into pi-dev
Marco Nelissen [Tue, 13 Mar 2018 02:11:30 +0000 (02:11 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174
am:
b3f50c9ccb -s ours
Change-Id: I1b214134e879310733ee40b138c29cfc0a78b32e
Kevin Chyn [Tue, 13 Mar 2018 02:04:59 +0000 (02:04 +0000)]
Merge "Fingerprint should check current client when task stack changes" into pi-dev
Jiyong Park [Tue, 13 Mar 2018 01:26:47 +0000 (10:26 +0900)]
Allow apps in /odm/app and /odm/priv-app (2/2)
/odm is another vendor partition other than /vendor. So,
duplicating remaining code fragments about /vendor/[app|priv-app] for /odm.
Bug:
71366495
Test: m -j
Change-Id: Ic0db416a02e3fa9a8ae03348449f68062e3d73b3
Teet: cd frameworks/base/tests/OdmApps; atest .
Bryce Lee [Tue, 13 Mar 2018 01:44:52 +0000 (01:44 +0000)]
Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev
Bryce Lee [Mon, 12 Mar 2018 16:04:44 +0000 (09:04 -0700)]
Use isKeyguardLocked to determine whether to resume.
Previously, we used isKeyguardActive to determine whether we should
resume an activity. This does not account for the keyguard going
away, which can leads to a timing issue where we do not resume an
activity when coming out of sleep from fingerprint unlock.
This change also prevents us from pausing a stopped activity that is
is considered to be the resumed activity as it will be brought to
the resumed state.
Fixes:
73991496
Test: Open display settings, lock screen, fingerprint unlock, press
back, verify main settings page is shown immediately.
Change-Id: I3a7a33f5359a41fc958e3d8e799c39f5193ecb56
TreeHugger Robot [Tue, 13 Mar 2018 01:41:35 +0000 (01:41 +0000)]
Merge "Allow carrier-privileged apps to access voicemail provider." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 01:41:35 +0000 (01:41 +0000)]
Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." into pi-dev
Vladislav Kaznacheev [Mon, 26 Feb 2018 23:02:59 +0000 (15:02 -0800)]
Display shortcut modifiers in menu
Prepend relevant meta key names (such as Ctrl+) to the shortcut
displayed in a menu.
Do not prepend "Menu+" if the device does not have a hardware Menu key.
Bug:
31045453
Test: run ApiDemos (MenuInflateFromXml), select "Shortcuts", observe
Ctrl+ prepended to shortcuts.
Change-Id: I1a38bd1baf069dd1adb24a26f89c6db6390b8b8d
(cherry picked from commit
0cc2c6b190695ef78029c7b05a175fb3bb7e4098)
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:54 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68 am:
d08bb4b174
Change-Id: I9749a1bacc983ee7fff06649f55d9b91d8df54ac
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:44 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94 am:
16ee12ac68
Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:33 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94
Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295