OSDN Git Service
Chavi Weingarten [Fri, 19 Apr 2019 23:16:24 +0000 (23:16 +0000)]
Revert "Update clearData flow for notification settings"
This reverts commit
224ef13774019a91bac24c60ba89fc21a5978e16.
Reason for revert: b/
130908336 - breaks tests
Change-Id: I124330a970bfca6a9e2db10415c498a1f45580ff
Bug:
130908336
Julia Reynolds [Fri, 19 Apr 2019 15:08:27 +0000 (11:08 -0400)]
Update clearData flow for notification settings
Some settings need to be maintained (like whether the app
is the default dialer), so don't just wipe away all of the settings.
Test: atest; clear data on default dialer and ensure missed call
notification is still in priority bucket
Fixes:
127855529
Change-Id: Ieba035ffd04de9eef64fa0dfa914209d887d40bf
TreeHugger Robot [Fri, 19 Apr 2019 08:53:22 +0000 (08:53 +0000)]
Merge "Monitor swap" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 06:56:51 +0000 (06:56 +0000)]
Merge "Ensure that we are removing recent tasks for a user including their profiles" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 06:52:03 +0000 (06:52 +0000)]
Merge "Change argument of MediaSession2.Builder#setExtras() as @NonNull" into qt-dev
Winson Chung [Fri, 19 Apr 2019 06:14:46 +0000 (06:14 +0000)]
Merge "Check that sysui states before allowing back gesture" into qt-dev
Rafal Slawik [Tue, 16 Apr 2019 12:16:15 +0000 (13:16 +0100)]
Monitor swap
Pull value of VmSwap from /proc/PID/status when capturing
ProcessMemoryState atom.
Before change:
(average pull time nanos)
43355896
(max pull time nanos)
75649278
After change:
(average pull time nanos)
86307073
(max pull time nanos)
151681474
Delta: 2x increase
Pulling frequency is controled via statsd and we trade-off more
expensive reads for more actionable data (helping detect memory leaks).
Bug:
130624561
Test: atest MemoryStatUtilTest
Test: benchmark pulling ProcessMemoryState atom
Test: manually take a statsd report
Change-Id: I1d90563b70b5253b3d31ddab4810db870620c4d4
(cherry picked from commit
65a9b7122ada9db7a95cdfe31fa97b328bd04a06)
TreeHugger Robot [Fri, 19 Apr 2019 05:40:41 +0000 (05:40 +0000)]
Merge "Add a flag to cancelDragAndDrop to skip animation" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 05:37:21 +0000 (05:37 +0000)]
Merge "Add AppPredictionServiceResolverComparator" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 05:35:02 +0000 (05:35 +0000)]
Merge "Add fallback for TEXTURE_TICK" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 05:31:43 +0000 (05:31 +0000)]
Merge "String review follow-up" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 05:24:24 +0000 (05:24 +0000)]
Merge "Remove restricted uitls methods for cross-profile calendar." into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 05:03:53 +0000 (05:03 +0000)]
Merge "Update wirelessly charging text on lockscreen" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 04:58:01 +0000 (04:58 +0000)]
Merge "Update Bubble clock face" into qt-dev
Tim Murray [Fri, 19 Apr 2019 04:40:56 +0000 (04:40 +0000)]
Merge "psi support for low memory detection inside ActivityManagerService" into qt-dev
Hyundo Moon [Thu, 18 Apr 2019 07:27:41 +0000 (16:27 +0900)]
Change argument of MediaSession2.Builder#setExtras() as @NonNull
Bug:
130777551
Test: make update-api -j;
Change-Id: I39431850d87a6a5e066b83dbbf39e4e9100ac839
TreeHugger Robot [Fri, 19 Apr 2019 04:09:23 +0000 (04:09 +0000)]
Merge "[wm]: ensure task positioner controller is always cleaned up" into qt-dev
Jin Seok Park [Fri, 19 Apr 2019 03:16:11 +0000 (03:16 +0000)]
Merge "Rename MediaSession2/MediaController2 methods" into qt-dev
Lucas Dupin [Fri, 19 Apr 2019 03:16:00 +0000 (03:16 +0000)]
Merge "Move padlock to the top of the lock screen" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 03:11:31 +0000 (03:11 +0000)]
Merge "Make LocaleList.isPseudoLocale a public API" into qt-dev
Po-Chien Hsueh [Tue, 16 Apr 2019 08:24:27 +0000 (16:24 +0800)]
String review follow-up
Rename "Android On Tap" to "Dynamic System Updates".
And, some string changes to follow review suggestions.
Bug:
129100345
Bug:
129330026
Test: make the package
Change-Id: I440e5beaa3831814d2f7f1063be16d073c5f2c38
Daichi Hirono [Mon, 15 Apr 2019 06:58:11 +0000 (15:58 +0900)]
Add a flag to cancelDragAndDrop to skip animation
When running cancel animation for drag shadow image, the system cannot
start another drag operation, which is problematic when the system would
start the other drag operation quickly.
Bug:
130313958
Test: Cancel drag operation by calling cancelDragAndDrop
Change-Id: I5d6650a0ce9a4cd80bbdb1beabc9e514349ccadc
Xiangyu/Malcolm Chen [Fri, 19 Apr 2019 02:18:45 +0000 (02:18 +0000)]
Merge "Adding @hide API to return whether an APN is metered or not." into qt-dev
George Hodulik [Sat, 13 Apr 2019 00:10:31 +0000 (17:10 -0700)]
Add AppPredictionServiceResolverComparator
This will sort the share activities based on the APS sorting.
We add a constructor for ResolverListController which takes an
AbstractResolverComparator, so that ChooserActivity may pass in
the APS comparator if it is enabled and available.
Test: Manually tested on APS sorter that did no sorting.
Test: atest frameworks/base/core/tests/coretests/src/com/android/internal/app
Bug:
129014961
Change-Id: I542254ffb0debad45bcd8d5073cc3f3e1bafc616
Signed-off-by: George Hodulik <georgehodulik@google.com>
Mady Mellor [Fri, 19 Apr 2019 01:44:15 +0000 (01:44 +0000)]
Merge "Revert "Remove the bubble if the notification is no longer FLAG_BUBBLE"" into qt-dev
Mady Mellor [Fri, 19 Apr 2019 01:39:23 +0000 (01:39 +0000)]
Revert "Remove the bubble if the notification is no longer FLAG_BUBBLE"
This reverts commit
34a3073cfd47f70c5453f6eb1ccf446b0f7ee387.
Bug:
128459529
Reason for revert: I bypassed treehugger but after looking at all the test failures some of them might have been me
Change-Id: I5e34001a3340610a86ab5d9f6ffd29ef6ecd7b39
Mady Mellor [Fri, 19 Apr 2019 01:36:39 +0000 (01:36 +0000)]
Merge "Remove the bubble if the notification is no longer FLAG_BUBBLE" into qt-dev
Winson Chung [Wed, 17 Apr 2019 22:40:11 +0000 (15:40 -0700)]
Ensure that we are removing recent tasks for a user including their profiles
- Also ensure that only the recents component can freeze the task list
Bug:
130662533
Test: atest RecentTasksTest
Change-Id: I0bdebcfd03f998b5a897e7622e9207c442b05957
Lucas Dupin [Wed, 17 Apr 2019 23:50:58 +0000 (16:50 -0700)]
Move padlock to the top of the lock screen
Test: tap on notification on lock screen
Test: tap on notification on shade locked
Test: swipe down from the top expanding QS
Test: swipe up from LS
Test: switch between pin, pattern and password
Test: add and remove locked sim card
Test: atest KeyguardBottomAreaTest
Test: atest KeyguardClockPositionAlgorithmTest
Test: atest KeyguardMessageAreaTest
Test: atest KeyguardIndicationControllerTest
Test: atest StatusBarKeyguardViewManagerTest
Test: atest KeyguardBouncerTest
Test: atest KeyguardPatternViewTest
Fixes:
130398499
Fixes:
130298363
Fixes:
129784068
Fixes:
130223966
Change-Id: Ib1706de259fa4b1f4ef13f654cbd931457733d82
Malcolm Chen [Thu, 18 Apr 2019 20:49:17 +0000 (13:49 -0700)]
Adding @hide API to return whether an APN is metered or not.
In addition, make isMmsDataEnabled more generic:
isDataEnabledForApn
Bug:
128616035
Test: manual
Change-Id: Icd520c3094dd761a13435fae79b7b6b3ba2ebda9
Andrew Chant [Thu, 18 Apr 2019 23:14:57 +0000 (23:14 +0000)]
Merge "Fix crash." into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 23:07:32 +0000 (23:07 +0000)]
Merge "Make RemoteService propagate Context#bindService failure to PendingRequests" into qt-dev
Brad Ebinger [Thu, 18 Apr 2019 21:39:33 +0000 (21:39 +0000)]
Merge "Modify docs to reflect operational changes in overrideConfig" into qt-dev
Nader Jawad [Thu, 18 Apr 2019 21:18:32 +0000 (21:18 +0000)]
Merge "Added BlendMode equivalent APIs to replace deprecated PorterDuff variants" into qt-dev
Winson Chung [Wed, 17 Apr 2019 23:54:23 +0000 (16:54 -0700)]
Check that sysui states before allowing back gesture
- Ensure not in immersive mode, and also that the notification panel is
not expanded
Bug:
130340004
Bug:
130417141
Test: Manual, ensure back doesn't work when notification panel is down or
app is in immersive mode
Change-Id: I29f5cd80cc89b28802ca8b2c9e2956ae5b3b1151
Lucas Dupin [Thu, 18 Apr 2019 21:00:31 +0000 (21:00 +0000)]
Merge "Fix dark mode NPE" into qt-dev
Joel Galenson [Thu, 18 Apr 2019 20:30:45 +0000 (13:30 -0700)]
Fix crash.
Fix a SysUI NullPointerException.
Bug:
130821357
Test: atest BubbleControllerTest KeyButtonViewTest
Change-Id: I56923480bd2c3441cd9328e52b4b5bd35d676dc2
Beverly [Thu, 18 Apr 2019 20:19:00 +0000 (16:19 -0400)]
Update wirelessly charging text on lockscreen
Test: manual
Bug:
130762799
Bug:
130762485
Change-Id: I87fc87fafd968cdb4987b1c55e79dbccf70ae137
Brad Ebinger [Wed, 17 Apr 2019 22:27:13 +0000 (15:27 -0700)]
Modify docs to reflect operational changes in overrideConfig
Bug:
130372397
Test: Manual
Merged-In: Iff2a6e2cf867ab2e8677ac67f31d87e0365ec9fa
Change-Id: Iff2a6e2cf867ab2e8677ac67f31d87e0365ec9fa
(cherry picked from commit
ddad44d41a32c7fbad33745c4542ce2931d627f4)
TreeHugger Robot [Thu, 18 Apr 2019 19:58:25 +0000 (19:58 +0000)]
Merge "Add @TestApi to StatusBarManager @SystemApi methods" into qt-dev
Cody Northrop [Thu, 18 Apr 2019 19:47:07 +0000 (19:47 +0000)]
Merge "GraphicsEnvironment: Expose query to determine ANGLE use" into qt-dev
Irina Dumitrescu [Thu, 18 Apr 2019 19:25:14 +0000 (19:25 +0000)]
Merge "Don't call ConnectivityService when holding ActivityManagerService lock." into qt-dev
Felipe Leme [Thu, 18 Apr 2019 19:06:04 +0000 (19:06 +0000)]
Merge "Remove ContentCaptureServerSession when app died." into qt-dev
Ryan Mitchell [Thu, 18 Apr 2019 19:04:40 +0000 (19:04 +0000)]
Merge "Add build number to aapt2 version" into qt-dev
Lucas Dupin [Thu, 18 Apr 2019 18:56:28 +0000 (11:56 -0700)]
Fix dark mode NPE
Fixes:
130812424
Test: toggle dark mode via tile after rebooting and dimssing power menu
Change-Id: I230c843f3246661286e2b4f56540da58fe8b0a3c
Dmitry Dementyev [Thu, 18 Apr 2019 18:50:56 +0000 (18:50 +0000)]
Merge "Use checkOp instead of noteOp in AccountManagerService." into qt-dev
Lucas Dupin [Thu, 18 Apr 2019 18:49:12 +0000 (18:49 +0000)]
Merge "Move dark theme tile to the right" into qt-dev
Hall Liu [Thu, 18 Apr 2019 18:24:53 +0000 (18:24 +0000)]
Merge "Change ServiceState and TelephonyRegistry logging" into qt-dev
Mady Mellor [Thu, 18 Apr 2019 18:21:22 +0000 (18:21 +0000)]
Merge "Fix back presses dismissing bubbles when IME is up" into qt-dev
Govinda Wasserman [Thu, 18 Apr 2019 18:17:15 +0000 (18:17 +0000)]
Merge "Adds timestamp to Assistant invocation bundles." into qt-dev
Tarandeep Singh [Thu, 18 Apr 2019 18:04:05 +0000 (18:04 +0000)]
Merge "Fix: Allow system IME to be disabled when another IME is available" into qt-dev
Mady Mellor [Thu, 11 Apr 2019 20:36:40 +0000 (13:36 -0700)]
Remove the bubble if the notification is no longer FLAG_BUBBLE
Previously if a notification that was a bubble got updated such that it
would fail our bubble criteria, we wouldn't actually remove the bubble we
would just stop updating that bubble. This CL fixes it so that we'll remove
the bubble in that case.
This CL also factors all of the 'shouldBubble' logic into Notification
InterruptionStateProvider.
Fixes:
128459529
Test: CTSVerifier tests in other CL; atest BubbleControllerTest
Change-Id: I4864ce1ef48354336bed57902083eeb57225e955
Lucas Dupin [Thu, 18 Apr 2019 17:28:38 +0000 (17:28 +0000)]
Merge "Indicate that a TrustAgent kept the phone unlocked" into qt-dev
Winson Chung [Thu, 18 Apr 2019 17:14:04 +0000 (17:14 +0000)]
Merge "Add ability to dump specific dependency controller" into qt-dev
Winson Chung [Wed, 17 Apr 2019 22:42:40 +0000 (15:42 -0700)]
Add ability to dump specific dependency controller
Bug:
130804868
Test: adb shell dumpsys activity service SystemUIService Dependency OverviewProxyService
Change-Id: Ie88f62d0d0b17ded6f8ff5d3d850f1f444eed444
Jiuyu Sun [Thu, 18 Apr 2019 17:05:18 +0000 (17:05 +0000)]
Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM." into qt-dev
Lucas Dupin [Thu, 18 Apr 2019 16:21:15 +0000 (09:21 -0700)]
Move dark theme tile to the right
Test: visual
Bug:
130253100
Change-Id: I833fbd13624b93c5b2318b19a30a270941d9bcae
TreeHugger Robot [Thu, 18 Apr 2019 15:48:26 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 15:40:25 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Varun Shah [Thu, 18 Apr 2019 15:31:48 +0000 (15:31 +0000)]
Merge "Add logs to identify screen state change callback in ATMS." into qt-dev
Jeff Sharkey [Thu, 18 Apr 2019 15:30:32 +0000 (15:30 +0000)]
Merge "Start bringing back legacy storage tests." into qt-dev
Robert Snoeberger [Wed, 17 Apr 2019 18:01:03 +0000 (14:01 -0400)]
Update Bubble clock face
This is part of the response to burn in testing.
Fixes:
130422138
Test: mp sysuig and checked clock in picker app
Change-Id: I97816379c160801e67ffb7b9fbb340d2d98e1255
Tim Murray [Thu, 18 Apr 2019 15:18:48 +0000 (15:18 +0000)]
Merge "DO NOT MERGE: disable iorap in q" into qt-dev
Lorenzo Colitti [Thu, 18 Apr 2019 15:06:34 +0000 (15:06 +0000)]
Merge "Change the validation URL for Chinese SIMs" into qt-dev
Jack Yu [Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)]
Merge "Update Multi-OffHost related API definition" into qt-dev
Remi NGUYEN VAN [Fri, 12 Apr 2019 12:54:46 +0000 (05:54 -0700)]
Change the validation URL for Chinese SIMs
The default HTTPS and fallback validation URLs are not accessible from
China, so users in China never get a validated network on WiFi with the
default AOSP settings. OEMs selling devices targeting China typically
change the check URLs for that reason.
When the device uses a Chinese SIM card, change the default validation
URLs to URLs accessible accessible from China as of now.
Test: inserted China SIM, WiFi off/on, dumpsys network_stack shows new
URL used
Bug:
111819230
Change-Id: Ib7f41f470ef1a9c7712f2477ebfab44e915cf1b9
Merged-In: Ib7f41f470ef1a9c7712f2477ebfab44e915cf1b9
(cherry picked from commit
990ea84d2d60256d8c752a4a582de0f5a28932c9)
Jack Yu [Thu, 18 Apr 2019 12:42:12 +0000 (12:42 +0000)]
Merge "Return copies for get methods" into qt-dev
Irina Dumitrescu [Mon, 15 Apr 2019 18:20:38 +0000 (19:20 +0100)]
Don't call ConnectivityService when holding ActivityManagerService lock.
Exclude system server thread from the threads on which we call updateHttpProxy() from the Activity Manager.
Test: atest HostsideVpnTests
Bug:
128465980
Change-Id: Ia2b2c6de8a01a264bfb09393144641d91ee2c164
TreeHugger Robot [Thu, 18 Apr 2019 11:17:43 +0000 (11:17 +0000)]
Merge "Ensure Contrast: Address API feedback" into qt-dev
Michal Karpinski [Thu, 18 Apr 2019 09:31:32 +0000 (09:31 +0000)]
Merge "Make sure Notification#deleteIntent cannot be used to start activities from background" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 09:25:51 +0000 (09:25 +0000)]
Merge "Organize intelligence counters together" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 09:07:43 +0000 (09:07 +0000)]
Merge "WifiMetrics: add histogram of passpoint provisioning" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 06:53:48 +0000 (06:53 +0000)]
Merge "Add ability to center a notification icon" into qt-dev
Jin Seok Park [Thu, 18 Apr 2019 03:52:46 +0000 (12:52 +0900)]
Rename MediaSession2/MediaController2 methods
Bug:
130769139
Test: atest CtsMediaTestCases:android.media.cts.MediaSession2Test
atest CtsMediaTestCases:android.media.cts.MediaController2Test
Change-Id: Ia6dc5e1b6f723f5827b693748111c6ae556cbe60
TreeHugger Robot [Thu, 18 Apr 2019 05:44:25 +0000 (05:44 +0000)]
Merge "Remove car mode dialer and call companion roles." into qt-dev
Remi NGUYEN VAN [Thu, 18 Apr 2019 05:36:34 +0000 (05:36 +0000)]
Merge "Add overlayable tag for NetworkStackConfig" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 04:45:43 +0000 (04:45 +0000)]
Merge "Roll forward "Make notification effects for automotive configurable."" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 04:35:43 +0000 (04:35 +0000)]
Merge "DO NOT MERGE: Fix a few issues with foreground service location accesses." into qt-dev
Jeff Sharkey [Thu, 18 Apr 2019 03:45:01 +0000 (03:45 +0000)]
Merge "Canonicalize default ringtones." into qt-dev
Jeff Sharkey [Thu, 18 Apr 2019 03:39:26 +0000 (03:39 +0000)]
Merge "Remove GROUP_ID; not actively being used by apps." into qt-dev
Jeff Sharkey [Thu, 18 Apr 2019 03:30:47 +0000 (21:30 -0600)]
Start bringing back legacy storage tests.
When APKs ask for the legacy storage world, we need the old tests to
verify they get the access they've been granted. (For example, an
app only granted READ_EXTERNAL_STORAGE, etc.)
Bug:
130619210,
130566083
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Change-Id: I943a7ea7ed6cb6728ec3bceb16edf1b2a7ad9b36
TreeHugger Robot [Thu, 18 Apr 2019 03:27:45 +0000 (03:27 +0000)]
Merge "API feedback: getSuppressNotification -> isNotificationSuppressed" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 03:24:14 +0000 (03:24 +0000)]
Merge "Fix process name for sw codec process" into qt-dev
Shawn Lin [Thu, 18 Apr 2019 03:04:28 +0000 (03:04 +0000)]
Merge "Fixed notification background shifted in landscape" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 02:28:43 +0000 (02:28 +0000)]
Merge "Add smart space to custom clock faces." into qt-dev
Peiyong Lin [Thu, 18 Apr 2019 02:16:57 +0000 (02:16 +0000)]
Merge "Make sure the color space range is checked properly." into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 01:39:51 +0000 (01:39 +0000)]
Merge "Add odm and oem policies" into qt-dev
Lucas Dupin [Thu, 18 Apr 2019 01:30:00 +0000 (18:30 -0700)]
Indicate that a TrustAgent kept the phone unlocked
Fixes:
130326679
Test: manual with SmartLock
Change-Id: Ic5bb8608313498f2608890eac5c226db06c20ac7
yj81.kwon [Wed, 17 Apr 2019 02:44:48 +0000 (19:44 -0700)]
[wm]: ensure task positioner controller is always cleaned up
If freeform windowing app is killed while moving, future touch action does not work.
TaskPositioner state is not reset properly. So InputChannel for positioning a task
consumes all touch event.
Finish task positioning when calling session process is killed.
Test: manual - Kill freefrom windowing task process while dragging it
Test: atest WmTests:TaskPositionerTests
Bug:
129492888
Change-Id: I7eb392d6d87a118dd85e7d752eaabfe600920794
(cherry picked from commit
70fe14b649461d9632f24db844b6054879df60b9)
Tim Murray [Thu, 14 Feb 2019 04:47:46 +0000 (20:47 -0800)]
psi support for low memory detection inside ActivityManagerService
Add LowMemDetector class and use it in ActivityManagerService to detect
memory conditions based on in-kernel psi monitors.
Test: boots, detects low memory
Bug:
129476847
Change-Id: I7a05ba36196d24ce5147b97c076e38b92dc71e2e
Signed-off-by: Tim Murray <timmurray@google.com>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Tim Murray [Wed, 10 Apr 2019 22:48:37 +0000 (15:48 -0700)]
DO NOT MERGE: disable iorap in q
iorap is not shipping in Q.
Test: boots, works
bug
72170747
Change-Id: Iabc63f880df24781fa9c6e0f4532a8f37c8d89d5
TreeHugger Robot [Thu, 18 Apr 2019 01:08:21 +0000 (01:08 +0000)]
Merge "MediaSession2Service: Log ControllerInfo in connection process" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 00:52:52 +0000 (00:52 +0000)]
Merge "Update atoms with the final API constants" into qt-dev
Selim Cinek [Thu, 18 Apr 2019 00:42:54 +0000 (00:42 +0000)]
Merge "Implemented dynamic privacy for redacted lockscreens" into qt-dev
Selim Cinek [Thu, 18 Apr 2019 00:23:01 +0000 (00:23 +0000)]
Merge "Removed unnecessary inflation executor logic" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 00:02:21 +0000 (00:02 +0000)]
Merge "Fix refactoring glitch in KeyStore.java" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 23:50:43 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Jeff Sharkey [Wed, 17 Apr 2019 16:39:42 +0000 (10:39 -0600)]
Canonicalize default ringtones.
Bug:
130445562
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ia4dee2f5596147ac50b2393fccb8516cc43b0102
TreeHugger Robot [Wed, 17 Apr 2019 23:39:41 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 23:23:29 +0000 (23:23 +0000)]
Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev