OSDN Git Service
Fyodor Kupolov [Tue, 8 May 2018 19:11:03 +0000 (19:11 +0000)]
Merge "Make SQLiteDebug @TestApi"
android-build-team Robot [Tue, 8 May 2018 19:02:40 +0000 (12:02 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
c2db8716e2 -s ours
am:
8f6ce29b1a -s ours
Change-Id: I3f4003d45fe8bbf23982d132fd1f1240bc8f6229
android-build-team Robot [Tue, 8 May 2018 18:58:59 +0000 (11:58 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
120e47282f -s ours
am:
17348a9a8d -s ours
Change-Id: I65e37766e6d847454ad8ed349544725e8cb0c126
Makoto Onuki [Tue, 8 May 2018 18:56:22 +0000 (11:56 -0700)]
Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev am:
c70d756bf6
am:
333ee9fd27
Change-Id: Ie81aaf569c6543ea0820de76e1f496a08d2db5bb
Android Build Merger (Role) [Tue, 8 May 2018 18:46:16 +0000 (18:46 +0000)]
Merge "Merge "Make android:cantSaveState an optional feature." into pi-dev am:
330dd0b244 am:
5e2cf45571"
android-build-team Robot [Tue, 8 May 2018 18:44:47 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Tue, 8 May 2018 18:43:18 +0000 (11:43 -0700)]
Merge "Make android:cantSaveState an optional feature." into pi-dev am:
330dd0b244
am:
5e2cf45571
Change-Id: Id8c89fa40853b41e19359540aa00c0aaaaf34f91
android-build-team Robot [Tue, 8 May 2018 18:41:37 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Tue, 8 May 2018 18:34:33 +0000 (11:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c2db8716e2 -s ours
Change-Id: I514ae888940f66c8ec4895ab06c3b1eed29af41f
android-build-team Robot [Tue, 8 May 2018 18:34:33 +0000 (18:34 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Tue, 8 May 2018 18:34:28 +0000 (18:34 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Tue, 8 May 2018 18:31:14 +0000 (11:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
120e47282f -s ours
Change-Id: I60e0da3be58cddac61800b8ba07acae50fe33c8f
android-build-team Robot [Tue, 8 May 2018 18:29:54 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Makoto Onuki [Tue, 8 May 2018 18:28:50 +0000 (11:28 -0700)]
Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev
am:
c70d756bf6
Change-Id: Iaa77f4ab265274cba5d906acb2b3d8e61963a66e
android-build-team Robot [Tue, 8 May 2018 18:23:40 +0000 (11:23 -0700)]
Merge "EBS: Don't disable vibration when accessibility is on" into pi-dev am:
9cd0e44482
am:
e5f72a5cd2
Change-Id: I7545592277266625028bb161160e758885105c9e
android-build-team Robot [Tue, 8 May 2018 18:21:49 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Tue, 8 May 2018 18:18:25 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Dianne Hackborn [Tue, 8 May 2018 18:16:28 +0000 (11:16 -0700)]
Merge "Make android:cantSaveState an optional feature." into pi-dev
am:
330dd0b244
Change-Id: Id9825ba64e762c1ce32eb5f3721315d724863b5d
android-build-team Robot [Tue, 8 May 2018 18:14:11 +0000 (11:14 -0700)]
Merge "Count launching the same app as an app launch for Quickstep onboarding" into pi-dev am:
1589a43ece
am:
3a055bfd6a
Change-Id: I530fc6c84f50d214feec28f81da513838ef2455d
android-build-team Robot [Tue, 8 May 2018 18:11:13 +0000 (11:11 -0700)]
Merge "EBS: Don't disable vibration when accessibility is on" into pi-dev
am:
9cd0e44482
Change-Id: Ie12393d98af737ed2713059f7d52e4c01edc9576
Makoto Onuki [Tue, 8 May 2018 18:09:56 +0000 (18:09 +0000)]
Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev
Ryan Mitchell [Tue, 8 May 2018 18:01:37 +0000 (11:01 -0700)]
Merge "AAPT: Fixed split resource dumping" into pi-dev am:
fb07d82086
am:
d94160943d
Change-Id: Idfef5422bbe3a3e46ceb1951e6393d2c80852930
Dianne Hackborn [Tue, 8 May 2018 17:59:32 +0000 (17:59 +0000)]
Merge "Make android:cantSaveState an optional feature." into pi-dev
android-build-team Robot [Tue, 8 May 2018 17:58:24 +0000 (17:58 +0000)]
Merge "EBS: Don't disable vibration when accessibility is on" into pi-dev
android-build-team Robot [Tue, 8 May 2018 17:57:14 +0000 (10:57 -0700)]
Merge changes I1539580e,I8452e799 into pi-dev am:
8ea760c815
am:
f0013528bc
Change-Id: I662b167e13ed386290dc802988b3225a60a67fc0
android-build-team Robot [Tue, 8 May 2018 17:53:02 +0000 (10:53 -0700)]
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev am:
188b642ac0
am:
9ec1c3fe3a
Change-Id: I7f5a0deb21e89d8b9f66af4cd88e63056edb1373
android-build-team Robot [Tue, 8 May 2018 17:48:55 +0000 (10:48 -0700)]
Merge "Fix intercepting touch events for guts" into pi-dev am:
87ffd28760
am:
b3e029cb38
Change-Id: Icbe2ca6dd5e6c30977944b6730650e1b36cfc4da
android-build-team Robot [Tue, 8 May 2018 17:43:32 +0000 (10:43 -0700)]
Merge "Count launching the same app as an app launch for Quickstep onboarding" into pi-dev
am:
1589a43ece
Change-Id: I1eed7766bb579971377feec3ae05aa94751031f7
Nicolas Geoffray [Tue, 8 May 2018 17:41:49 +0000 (10:41 -0700)]
Merge "Add some JobInfo APIs in light grey." into pi-dev am:
da801c2a25
am:
5b9acb5fcd
Change-Id: I5e69afa174ee18ef1bc463bf66e7e1f9ef1846e4
Ryan Mitchell [Tue, 8 May 2018 17:28:36 +0000 (10:28 -0700)]
Merge "AAPT: Fixed split resource dumping" into pi-dev
am:
fb07d82086
Change-Id: I66dedae28679c07e0bfa76cfafba97d563356fcb
android-build-team Robot [Tue, 8 May 2018 17:26:31 +0000 (17:26 +0000)]
Merge "Count launching the same app as an app launch for Quickstep onboarding" into pi-dev
Ryan Mitchell [Tue, 8 May 2018 17:17:17 +0000 (17:17 +0000)]
Merge "AAPT: Fixed split resource dumping" into pi-dev
android-build-team Robot [Tue, 8 May 2018 16:56:11 +0000 (09:56 -0700)]
Merge changes I1539580e,I8452e799 into pi-dev
am:
8ea760c815
Change-Id: I4273e08bb50ba9b509171ea65d32bb6757a4a2b7
android-build-team Robot [Tue, 8 May 2018 16:46:12 +0000 (09:46 -0700)]
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev
am:
188b642ac0
Change-Id: Ie3a7de65c4b8d06a5b0110a93689ca604bdf858a
android-build-team Robot [Tue, 8 May 2018 16:41:47 +0000 (16:41 +0000)]
Merge changes I1539580e,I8452e799 into pi-dev
* changes:
Volume dialog mulit-streams have 8dp padding
Check if alarm and now times are in schedule
android-build-team Robot [Tue, 8 May 2018 16:41:04 +0000 (09:41 -0700)]
Merge "Fix intercepting touch events for guts" into pi-dev
am:
87ffd28760
Change-Id: If558d3856e5572e130fc5506e1b9f129828cad63
Nicolas Geoffray [Tue, 8 May 2018 16:35:13 +0000 (09:35 -0700)]
Merge "Add some JobInfo APIs in light grey." into pi-dev
am:
da801c2a25
Change-Id: I6cad7d446beb7cd0f8bcf0044de27722aa232142
android-build-team Robot [Tue, 8 May 2018 16:21:39 +0000 (16:21 +0000)]
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev
Winson Chung [Tue, 8 May 2018 16:21:19 +0000 (09:21 -0700)]
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev am:
0f3698c88a
am:
442ab23ca5
Change-Id: Ifead6c8fc26e63315b6266864e8aaa791953ca4f
android-build-team Robot [Tue, 8 May 2018 16:19:50 +0000 (16:19 +0000)]
Merge "Fix intercepting touch events for guts" into pi-dev
android-build-team Robot [Tue, 8 May 2018 16:15:37 +0000 (16:15 +0000)]
Merge "[Android WebView] print minimum sdk version required for WebView APKs"
Winson Chung [Tue, 8 May 2018 16:08:01 +0000 (09:08 -0700)]
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev
am:
0f3698c88a
Change-Id: Id21b521fe83bc4f7afa922ee540f35fa35201c16
Nicolas Geoffray [Tue, 8 May 2018 16:06:04 +0000 (16:06 +0000)]
Merge "Add some JobInfo APIs in light grey." into pi-dev
android-build-team Robot [Tue, 8 May 2018 15:58:44 +0000 (08:58 -0700)]
Merge "Remove ticker text for screenshot saving notification." into pi-dev am:
70c9a79127
am:
069d14cfef
Change-Id: Iaaa7ee1aeab3e1473ff424ca87dacff22a2dd804
Winson Chung [Tue, 8 May 2018 15:51:04 +0000 (15:51 +0000)]
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev
android-build-team Robot [Tue, 8 May 2018 15:45:11 +0000 (08:45 -0700)]
Merge "Remove ticker text for screenshot saving notification." into pi-dev
am:
70c9a79127
Change-Id: I35594cbfb73048ae2fe7d3757232d193632d1d5a
android-build-team Robot [Tue, 8 May 2018 15:28:31 +0000 (15:28 +0000)]
Merge "Remove ticker text for screenshot saving notification." into pi-dev
Makoto Onuki [Tue, 8 May 2018 15:25:53 +0000 (08:25 -0700)]
Merge "Fix "battery saver" notification keeping coming back." into pi-dev am:
f450a7266b
am:
9a20164149
Change-Id: I96fcfd531eabc46a7767b2c541da90a5de12e3ec
android-build-team Robot [Tue, 8 May 2018 15:21:33 +0000 (08:21 -0700)]
[automerger skipped] Merge "Adding batterystats history to proto dump." into pi-dev am:
291b944d89
am:
ccb89f9263 -s ours
Change-Id: I7981e34b4029b46233f7a47d3ad3f1c7f56a61a5
android-build-team Robot [Tue, 8 May 2018 15:18:47 +0000 (15:18 +0000)]
Merge "Use Meta+Space for hard-keyboard layout switching"
Makoto Onuki [Tue, 8 May 2018 15:17:18 +0000 (08:17 -0700)]
Merge "Fix "battery saver" notification keeping coming back." into pi-dev
am:
f450a7266b
Change-Id: Ie3d52e44e04737d07efe8f75e04cae1e5f86b400
Beverly [Tue, 8 May 2018 15:16:02 +0000 (11:16 -0400)]
Volume dialog mulit-streams have 8dp padding
Change-Id: I1539580e2d848521638b50c10bd51c18ff415268
Fixes:
79353898
Test: visual inspection with multi-stream and dnd
Makoto Onuki [Tue, 8 May 2018 15:11:57 +0000 (15:11 +0000)]
Merge "Fix "battery saver" notification keeping coming back." into pi-dev
android-build-team Robot [Tue, 8 May 2018 15:11:22 +0000 (08:11 -0700)]
Merge "Adding batterystats history to proto dump." into pi-dev
am:
291b944d89
Change-Id: Ie1766ac31bc048eeba13d540c446372ef56c2da6
Nicolas Geoffray [Tue, 8 May 2018 15:04:30 +0000 (16:04 +0100)]
Add some JobInfo APIs in light grey.
bug:
79258941
Test: m
Change-Id: Ief508c5785482a28ee0262cc168b01d3b632fbfa
Steven Wu [Tue, 8 May 2018 15:03:17 +0000 (11:03 -0400)]
Fixes a NPE in search manager in CTS tests.
Test: atest CtsSliceTestCases
Change-Id: I9e9b3bbcf0dc980e5189293abcee95ff374e309f
Fixes:
76211625
android-build-team Robot [Tue, 8 May 2018 14:58:09 +0000 (14:58 +0000)]
Merge "Adding batterystats history to proto dump." into pi-dev
android-build-team Robot [Tue, 8 May 2018 14:43:12 +0000 (07:43 -0700)]
[automerger skipped] Merge "Store package restriction settings at shutdown" into pi-dev am:
ae4a20c75b -s ours
am:
769039598b -s ours
Change-Id: Iddff2ac670ae5b3cb0f6e84924e0f58e208bf009
android-build-team Robot [Tue, 8 May 2018 14:34:57 +0000 (07:34 -0700)]
[automerger skipped] Merge "Store package restriction settings at shutdown" into pi-dev
am:
ae4a20c75b -s ours
Change-Id: Iafb944832459af35cbc1f6df2c7d6a06b3cc51c1
android-build-team Robot [Tue, 8 May 2018 14:22:30 +0000 (14:22 +0000)]
Merge "Store package restriction settings at shutdown" into pi-dev
Beverly [Fri, 4 May 2018 15:21:20 +0000 (11:21 -0400)]
Check if alarm and now times are in schedule
Bug:
77570224
Bug:
79230399
Test: ScheduleCalendarTest
Change-Id: I8452e799189dab0559b49f1e62b18b7106929cd3
Bill Yi [Tue, 8 May 2018 12:50:55 +0000 (05:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I463ac2560e83ff4f58c588e7b19986870f55bebd
Annie Meng [Tue, 8 May 2018 12:45:57 +0000 (12:45 +0000)]
Merge "Remove unused critical accessibility settings from backup/restore"
Bill Yi [Tue, 8 May 2018 12:17:36 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id00ecb9d9837d898f7ca4ec4af953a3e89421a35
Auto-generated-cl: translation import
Edward Chen [Tue, 8 May 2018 10:14:29 +0000 (10:14 +0000)]
Merge "Backup and restore default alarm sound setting."
Remi NGUYEN VAN [Tue, 8 May 2018 09:24:48 +0000 (02:24 -0700)]
Merge "Fix testRegisterUsageCallback" am:
d0b9f983d6 am:
66674ce8fb
am:
6b8e9a0635
Change-Id: I2a64dcaa10cd4f26e6508be9bad1d4ecc1dc3d12
Remi NGUYEN VAN [Tue, 8 May 2018 09:13:00 +0000 (02:13 -0700)]
Merge "Fix testRegisterUsageCallback" am:
d0b9f983d6
am:
66674ce8fb
Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
Bill Yi [Tue, 8 May 2018 09:04:29 +0000 (02:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icba148a61ddf79c00763628ac9b3c66f64f29cd2
Remi NGUYEN VAN [Tue, 8 May 2018 09:00:59 +0000 (02:00 -0700)]
Merge "Fix testRegisterUsageCallback"
am:
d0b9f983d6
Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
Bill Yi [Tue, 8 May 2018 08:57:46 +0000 (01:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I038854548e14229b6cc430cebae4e51d18e338ae
Auto-generated-cl: translation import
Bill Yi [Tue, 8 May 2018 08:31:54 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45eb760f95cdb440ad6f1651181f0c4f4dd3bb16
Auto-generated-cl: translation import
Bill Yi [Tue, 8 May 2018 08:25:16 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic8679fc677aed2c9ffe472df7b2392da5d81af1b
Auto-generated-cl: translation import
Bill Yi [Tue, 8 May 2018 07:57:26 +0000 (00:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I12620b459462e39ef487709327a7f61929d3b589
Auto-generated-cl: translation import
Remi NGUYEN VAN [Tue, 8 May 2018 07:55:42 +0000 (07:55 +0000)]
Merge "Fix testRegisterUsageCallback"
Winson Chung [Fri, 4 May 2018 01:03:15 +0000 (18:03 -0700)]
Cancel any recents animation whenever a display's stack order changes
- The recents animation holds a reference to the stack that the recents
stack was previously behind (before the animation started) and should be
restored behind after the animation ends. Due to the ordering of events,
it is possible for a call to cancelRecentsAnimation() to come in after
we have started the transition to home
ie.
1) in app A
2) touch down on home button -> start recents animation, home stack
saves A stack as the one to restore behind if animation doesn't
finish
3) touch up to trigger button -> PWM to start home activity and
simultaneously proxies the motion even to launcher which happens to
call cancelRecentsAnimation (as a part of a catch all)
4) PWM start activity -> move home stack to top
5) cancelRecentsAnimation from launcher will try to restore the home
stack behind A, when the rest of the system has already thought
that the home stack was already moved to the front and focused
Instead of depending on any particular ordering of events, we can just
cancel the recents animation (without reordering) whenever the display's
stacks change so as not to affect any upcoming changes. There is only
one stack order changed listener (the recents animation, and there can
only be one animation at a time; the previous animation is always
canceled and unregisters the listener when cleaning up.
- Revert the old workaround for Beta 1 in PWM as it doesn't catch other
cases
- Removed confusing code suggesting that we were using a non-default
display (we are always only ever doing this animation for the default
display since that's where we resolved the target stack).
Bug:
73188263
Test: Was able to repro by artificially calling cancelRecentsAnimation
immediately after starting home (and also by swiping up, holding,
then invoking the home via adb (to trigger start activity) and then
releasing (to trigger cancelRecentsAnimation)). Ensure that case
now works.
Test: atest FrameworksServicesTests:RecentsAnimationTest
Test: atest FrameworksServicesTests:ActivityStackTests
Change-Id: Iec1a29b5bb53737b4be3f1a3719c4e7c26313a11
android-build-team Robot [Tue, 8 May 2018 06:13:15 +0000 (23:13 -0700)]
Merge "AOD padding animation should match slice" into pi-dev am:
1b5e2d8b3e
am:
299eba7cef
Change-Id: Id8b78ff37f5c6b6b0edd3ef6b7f6e90a84901b6c
android-build-team Robot [Tue, 8 May 2018 06:03:51 +0000 (23:03 -0700)]
Merge "AOD padding animation should match slice" into pi-dev
am:
1b5e2d8b3e
Change-Id: I9795fc0a2e780c6b8075ea5f4c5a4d514b1a61b0
android-build-team Robot [Tue, 8 May 2018 05:52:36 +0000 (05:52 +0000)]
Merge "AOD padding animation should match slice" into pi-dev
Remi NGUYEN VAN [Tue, 8 May 2018 05:47:55 +0000 (22:47 -0700)]
Merge "Fix testUidPoliciesToString" am:
c8613f9965 am:
717f4e19d8
am:
44e953f177
Change-Id: I9f94bcc30714ea50bbb3825f51b9a48cacaab4f4
Remi NGUYEN VAN [Tue, 8 May 2018 05:32:14 +0000 (22:32 -0700)]
Merge "Fix testUidPoliciesToString" am:
c8613f9965
am:
717f4e19d8
Change-Id: Ic61bf635c929f3e3e14bb913eba238cd53e955a6
Remi NGUYEN VAN [Tue, 8 May 2018 05:24:56 +0000 (22:24 -0700)]
Merge "Fix testUidPoliciesToString"
am:
c8613f9965
Change-Id: I3ec2fd01ca55ef63d0bfe0cec48854f852c736cc
Wei Sheng Shih [Tue, 8 May 2018 04:48:04 +0000 (21:48 -0700)]
Merge "Reload wallpaper after user unlock." into pi-dev am:
f687efc455
am:
42e687a61a
Change-Id: I75941068d26709dd4184830cc4543389fe54f287
Tyler Gunn [Tue, 8 May 2018 04:38:04 +0000 (21:38 -0700)]
Merge "Make TelecomManager#endCall a public API." into pi-dev am:
872a039ab3
am:
aae778c669
Change-Id: I9deb321220ca1a058c88ac1dd36cfddd07b25152
Wei Sheng Shih [Tue, 8 May 2018 04:23:53 +0000 (21:23 -0700)]
Merge "Reload wallpaper after user unlock." into pi-dev
am:
f687efc455
Change-Id: Ifa0d5f895999f43a759e7322262f26aa97543d3d
Wei Sheng Shih [Tue, 8 May 2018 04:13:35 +0000 (04:13 +0000)]
Merge "Reload wallpaper after user unlock." into pi-dev
Remi NGUYEN VAN [Tue, 8 May 2018 04:13:07 +0000 (04:13 +0000)]
Merge "Fix testUidPoliciesToString"
Tyler Gunn [Tue, 8 May 2018 04:11:14 +0000 (21:11 -0700)]
Merge "Make TelecomManager#endCall a public API." into pi-dev
am:
872a039ab3
Change-Id: Ic52e1705ce497b0a46bb4107ad854a8b939b38b0
Tyler Gunn [Tue, 8 May 2018 04:01:35 +0000 (04:01 +0000)]
Merge "Make TelecomManager#endCall a public API." into pi-dev
android-build-team Robot [Tue, 8 May 2018 03:55:13 +0000 (03:55 +0000)]
Merge "Add CLEAR_APP_CACHE check for deletePreloadsFileCache."
Android Build Merger (Role) [Tue, 8 May 2018 03:34:22 +0000 (03:34 +0000)]
Merge "Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev am:
1b93e623be am:
87f2b66d88"
Bryan Henry [Tue, 8 May 2018 03:33:51 +0000 (20:33 -0700)]
Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev am:
1b93e623be
am:
87f2b66d88
Change-Id: If5f7e7d3dd117c91143b604ba2e594fe06b7e691
android-build-team Robot [Tue, 8 May 2018 03:33:20 +0000 (03:33 +0000)]
Merge "Align account icon size of ChooseAccountTypeActivity"
Bryan Henry [Tue, 8 May 2018 03:21:47 +0000 (20:21 -0700)]
Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev
am:
1b93e623be
Change-Id: Ic54d1be1284eb0802aab04b99d835085200fe81b
Bryan Henry [Tue, 8 May 2018 03:08:19 +0000 (03:08 +0000)]
Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev
* changes:
Allow changing signing cert for system apps that use shared users
Revert "Allow shared users to rotate signing certs in an OTA"
android-build-team Robot [Tue, 8 May 2018 02:38:23 +0000 (02:38 +0000)]
Merge "Adding batterystats history to proto dump."
android-build-team Robot [Tue, 8 May 2018 02:29:32 +0000 (19:29 -0700)]
Merge "Update text size of overflow number view" into pi-dev am:
414be0b1cb
am:
b8d7a58c72
Change-Id: Iee66845c12c9a4de95280b602a3c9d4dda777090
android-build-team Robot [Tue, 8 May 2018 02:24:37 +0000 (19:24 -0700)]
Merge "Reset the profile when system application change version." into pi-dev am:
d24c5de834
am:
df084360ce
Change-Id: Icf1ef92588e711c599409554830125e7c30cfcbd
android-build-prod (mdb) [Tue, 8 May 2018 02:19:31 +0000 (19:19 -0700)]
Merge "Convert android.test.runner.stubs to Soong" am:
6fa8d06c78 am:
c8a0259721
am:
3561420fe6
Change-Id: I153ab7500e63f059b08a39bcfb1be508158e98dd
Jean-Michel Trivi [Tue, 8 May 2018 02:13:19 +0000 (19:13 -0700)]
Merge "AudioFocusRequest: fix doc for focus listener dispatch" into pi-dev am:
7d32a1e045
am:
3b413dbd11
Change-Id: I6af73b09fbdfbbcb3dc901240329ccbc512cba7e
chenedward [Thu, 3 May 2018 04:13:45 +0000 (12:13 +0800)]
Backup and restore default alarm sound setting.
As currently we don't backup/restore the selected alarm sound
(alarm_alert), but both notification sound and ringtone did,
we add the feature to completed backup/restore sound setting.
Bug:
78330382
Test: atest FrameworksCoreTests:SettingsBackupTest
Change-Id: I83321b5cdab4b7b13c46fa4f32785750e3824fc1
OSDN Git Service
