OSDN Git Service
TreeHugger Robot [Fri, 29 Jun 2018 15:08:19 +0000 (15:08 +0000)]
Merge "Fix file matching w/ full-backup rules xml"
Bernardo Rufino [Wed, 27 Jun 2018 11:50:44 +0000 (12:50 +0100)]
Fix file matching w/ full-backup rules xml
Documentation is pretty vague:
https://developer.android.com/guide/topics/data/autobackup#XMLSyntax.
But there were a couple of issues:
* It was prematurely returning false without consuming the rest of the
includes (cause of the bug linked).
* It was using string comparison for checking if a file is in a
directory, which ended up flagging directories such as "a/b" as
containing files "a/b.txt".
Reviewers,
* Please, pay full attention to test cases.
* Since this is code move + code change, set diff as 2..latest to check
changes to the function.
Bug:
110720194
Test: atest BackupUtilsTest
Test: Backup and restore app w/ multiple directory includes, verify
everything restored
Change-Id: Ic0fea43156ce8fb641af69ae73679289a20c291c
Sundong Ahn [Fri, 29 Jun 2018 04:12:16 +0000 (21:12 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library" am:
10cfc61774 am:
35d6bafc57
am:
3be9f7072a
Change-Id: I737cd14d3af988abde8c60d061d1c3526ad40749
Riddle Hsu [Fri, 29 Jun 2018 03:57:40 +0000 (03:57 +0000)]
Merge "Check for valid surface when starting to drag"
Sundong Ahn [Fri, 29 Jun 2018 03:53:52 +0000 (20:53 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library" am:
10cfc61774
am:
35d6bafc57
Change-Id: I205f0f1811b68aa41d105fbd8db24db52ae2d35e
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:53:05 +0000 (20:53 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests" am:
855f0f03e1 -s ours am:
44b1914000 -s ours
am:
cee918d925 -s ours
Change-Id: I73c1742115d932a64f0788e1b26ebca32cc25773
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:44:05 +0000 (20:44 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests" am:
855f0f03e1 -s ours
am:
44b1914000 -s ours
Change-Id: Id6a4bb03399d46a9e709cc13e6e338d884c3b87b
Sundong Ahn [Fri, 29 Jun 2018 03:38:09 +0000 (20:38 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
am:
10cfc61774
Change-Id: Ie6abdaa1c9f58ada60da5514bbd1ed261d09fd0b
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:34:19 +0000 (20:34 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests"
am:
855f0f03e1 -s ours
Change-Id: I9ad7743e43efd5aaa722e73ea0b2543537d23c50
Winson Chung [Fri, 29 Jun 2018 03:13:25 +0000 (03:13 +0000)]
Merge "Ensure PiP test apis are marked as TestApi"
Treehugger Robot [Fri, 29 Jun 2018 02:51:43 +0000 (02:51 +0000)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
Remi NGUYEN VAN [Fri, 29 Jun 2018 02:15:47 +0000 (02:15 +0000)]
Merge "Disable hidden API checks on unit tests"
Kevin Chyn [Fri, 29 Jun 2018 01:55:52 +0000 (01:55 +0000)]
Merge "Change resource name to be consistent with fingerprint"
TreeHugger Robot [Fri, 29 Jun 2018 01:06:21 +0000 (01:06 +0000)]
Merge "Improving WTF logging in AlarmManager"
TreeHugger Robot [Fri, 29 Jun 2018 00:58:36 +0000 (00:58 +0000)]
Merge "Pull AUTOGROUP_AT_COUNT into an XML config."
Brad Ebinger [Fri, 29 Jun 2018 00:43:48 +0000 (17:43 -0700)]
Merge "Emergency SMS carrier config flag" am:
36a9fa62be am:
86ec65e59c
am:
0bb18995dc
Change-Id: I4bc7ca9080af8f0bd06c4ab0fe547640314819e1
Brad Ebinger [Fri, 29 Jun 2018 00:34:48 +0000 (17:34 -0700)]
Merge "Emergency SMS carrier config flag" am:
36a9fa62be
am:
86ec65e59c
Change-Id: I63df676bf2270532c84cb950e4cac13858fbd4fb
Brad Ebinger [Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)]
Merge "Emergency SMS carrier config flag"
am:
36a9fa62be
Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017
Nathan Harold [Thu, 28 Jun 2018 23:46:07 +0000 (16:46 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" am:
9ca4d43922 -s ours am:
f0893a15ab -s ours
am:
d67a9006b4 -s ours
Change-Id: Ibd255cbdaa91e1770471aa1e84151105b33915a3
Nathan Harold [Thu, 28 Jun 2018 23:36:02 +0000 (16:36 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" am:
9ca4d43922 -s ours
am:
f0893a15ab -s ours
Change-Id: I039631fce137f11a1eb6d65d57f5150b50b73303
Nathan Harold [Thu, 28 Jun 2018 23:26:56 +0000 (16:26 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
am:
9ca4d43922 -s ours
Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34
TreeHugger Robot [Thu, 28 Jun 2018 23:16:18 +0000 (23:16 +0000)]
Merge "Set initial KSV state after inflation"
Winson Chung [Thu, 28 Jun 2018 22:42:06 +0000 (15:42 -0700)]
Ensure PiP test apis are marked as TestApi
Bug:
77533294
Test: atest CtsAndroidAppTestCases:PictureInPictureParamsBuilderTest
Change-Id: Icbcea8cf9d7e49db7ebcc1ce676b43722f75b7f4
Dongwon Kang [Thu, 28 Jun 2018 22:20:16 +0000 (22:20 +0000)]
Merge "Clean up libmedia2_jni Android.bp"
Brad Ebinger [Thu, 28 Jun 2018 22:16:10 +0000 (22:16 +0000)]
Merge "Emergency SMS carrier config flag"
TreeHugger Robot [Thu, 28 Jun 2018 22:13:42 +0000 (22:13 +0000)]
Merge "Ignore user portion when checking for system uid"
Lucas Dupin [Tue, 26 Jun 2018 22:58:51 +0000 (15:58 -0700)]
Set initial KSV state after inflation
In O and before, KeyguardSecurityVew#reset was always called
before showing the view. In P it's not possible since reset()
will make a series of binder calls and generate jank during
swipe gesture.
Because of this, reset() is called after inflation and only
after the view isn't visible anymore.
Fixes:
109972705
Test: go/sysui-bouncer-tests
Test: receive notification from AOD, double tap it.
Change-Id: I9016924398930d470135851ba40c85f637a2c0d1
Nathan Harold [Thu, 28 Jun 2018 22:05:56 +0000 (22:05 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
Siddharth Ray [Thu, 28 Jun 2018 21:57:25 +0000 (14:57 -0700)]
Merge "Fix in Wifi activity updates" into pi-dev am:
f83e814b18
am:
742ccd759d
Change-Id: I83a4e7a31bdcbccdb7d8b98df4fac81c4c599ed3
Suprabh Shukla [Wed, 27 Jun 2018 23:40:55 +0000 (16:40 -0700)]
Improving WTF logging in AlarmManager
Logs could have been misleading if the alarm thread was switched out and
did not get to process alarms for some time.
Test: Builds, boots, existing tests CtsAlarmManagerTestCases pass
Bug:
78560047
Change-Id: Ib450c3f7a936ab127cbd9d87eff78f1c589d9701
Siddharth Ray [Thu, 28 Jun 2018 21:46:17 +0000 (14:46 -0700)]
Merge "Fix in Wifi activity updates" into pi-dev
am:
f83e814b18
Change-Id: I7e42a65ef660029ecfc8a3bf17dac7b5beede755
TreeHugger Robot [Thu, 28 Jun 2018 21:33:24 +0000 (21:33 +0000)]
Merge "Fix in Wifi activity updates" into pi-dev
Riddle Hsu [Thu, 28 Jun 2018 13:44:50 +0000 (21:44 +0800)]
Check for valid surface when starting to drag
Also protect creating SurfaceSession with root surface.
Change-Id: I3649f160e85367169710b36faf26c96bef0f71fe
Fix:
110922266
Test: atest CtsViewTestCases:android.view.cts.DragDropTest
Nick James [Thu, 28 Jun 2018 20:58:44 +0000 (20:58 +0000)]
Merge "Disable DND status change notification on watches."
Santiago Etchebehere [Thu, 28 Jun 2018 20:25:57 +0000 (13:25 -0700)]
Merge "Force redraw after wallpaper is loaded" into pi-dev am:
15c1e47e26
am:
66867db010
Change-Id: I2e9dac0d3672c6a9e0f0084f7efb0d321347db12
Santiago Etchebehere [Thu, 28 Jun 2018 20:18:09 +0000 (13:18 -0700)]
Merge "Force redraw after wallpaper is loaded" into pi-dev
am:
15c1e47e26
Change-Id: I7362cd3c6e351814ca090db5a6082fa09b31dd32
TreeHugger Robot [Thu, 28 Jun 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Force redraw after wallpaper is loaded" into pi-dev
Beverly [Thu, 28 Jun 2018 19:38:45 +0000 (15:38 -0400)]
Ignore user portion when checking for system uid
In UsageStatsService, the calling uid is considered
from the system regardeless of the curret user id
Change-Id: I5c33db37c585ac918a09ad9014bb819b1e24d7f8
Fixes:
110527624
Test: manual
Adora Zhang [Tue, 26 Jun 2018 02:18:41 +0000 (19:18 -0700)]
Pull AUTOGROUP_AT_COUNT into an XML config.
Test: runtest systemui-notification
Change-Id: I0bf1bacb116b1cf4e77a2e1020c8de0749173224
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Merged-In: Ie18be2cd72c49f1859d1434428f82f164bed8756
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Matthew Ng [Thu, 28 Jun 2018 17:45:40 +0000 (10:45 -0700)]
Merge "Do not create highlight if track width is invalid" into pi-dev am:
ed60140a93
am:
f3cdbd2755
Change-Id: Ia25977dd17a536b85d57e5700ffe02244dff77cb
Matthew Ng [Thu, 28 Jun 2018 17:37:50 +0000 (10:37 -0700)]
Merge "Do not create highlight if track width is invalid" into pi-dev
am:
ed60140a93
Change-Id: I1fc23d1edd74b8aa0368da397bbdb84bac361da3
TreeHugger Robot [Thu, 28 Jun 2018 17:34:31 +0000 (17:34 +0000)]
Merge "Remove unused SMS & WAP intent filters"
TreeHugger Robot [Thu, 28 Jun 2018 17:34:11 +0000 (17:34 +0000)]
Merge "Remove sleep_timeout setting from backup"
TreeHugger Robot [Thu, 28 Jun 2018 17:25:37 +0000 (17:25 +0000)]
Merge "Do not create highlight if track width is invalid" into pi-dev
Nick [Wed, 27 Jun 2018 21:26:57 +0000 (14:26 -0700)]
Disable DND status change notification on watches.
In some situations the watch may show notification when the zen mode (do
not disturb) has changed. However, when this happens clicking on the
notification has no effect as outlined in the bug report. We've
determined that we do not want this notification to ever appear on a
watch.
Bug:
74178001
Change-Id: I68502a83a0914a6aea50ef99b0a3e28270689e0d
Bernardo Rufino [Thu, 28 Jun 2018 09:59:24 +0000 (10:59 +0100)]
Remove sleep_timeout setting from backup
It is not user-configurable.
Bug:
79779285
Test: atest SettingsBackupTest
Test: # w/ LocalTransport
adb shell settings put secure sleep_timeout 5000
adb shell bmgr backupnow com.android.providers.settings
adb shell settings put secure sleep_timeout 3000
adb shell bmgr restore 1 com.android.providers.settings
adb shell settings get secure sleep_timeout => ensure 3000
Change-Id: I68bf2f91cc3d4c00463468a6abaef3b64d5c10b9
WyattRiley [Sat, 23 Jun 2018 17:37:48 +0000 (10:37 -0700)]
Remove unused SMS & WAP intent filters
These intent filters are no longer listened to since Oreo,
so removing their setup.
Bug:
110925879
Test: Build & GPS sanity check on Pixel 2
Change-Id: Ie6e9e0ecf5d42d250a37a1d89245cb088cca75fa
Yuanjia Hsu [Thu, 28 Jun 2018 13:10:27 +0000 (13:10 +0000)]
Merge "Add separated emergency option on power menu"
TreeHugger Robot [Thu, 28 Jun 2018 05:48:29 +0000 (05:48 +0000)]
Merge "Reduce screen layout in task override configuration from its parent config"
Shawn Willden [Thu, 28 Jun 2018 05:43:43 +0000 (22:43 -0700)]
Merge "Correct the keystore alias used for secure imports" into pi-dev am:
143c65d520
am:
bd3440cac9
Change-Id: I84b68a7caa793c776140cdd2bd79b5b76c63ddd3
Shawn Willden [Thu, 28 Jun 2018 05:16:49 +0000 (22:16 -0700)]
Merge "Correct the keystore alias used for secure imports" into pi-dev
am:
143c65d520
Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
TreeHugger Robot [Thu, 28 Jun 2018 05:07:38 +0000 (05:07 +0000)]
Merge "Correct the keystore alias used for secure imports" into pi-dev
Dan Sandler [Thu, 28 Jun 2018 04:42:12 +0000 (21:42 -0700)]
[automerger skipped] Merge "P is for PAINT." into pi-dev am:
bed68535c0
am:
69baf0d2a4 -s ours
Change-Id: I5bbc3a4461fbf6fcbe05b6465d1335f845f97c1b
Louis Chang [Tue, 26 Jun 2018 09:58:29 +0000 (17:58 +0800)]
Reduce screen layout in task override configuration from
its parent config
This prevented scheduling unexpected screen layout size
changes to client when entering PIP.
Bug:
110808291
Test: atest ActivityManagerPinnedStackTests
Test: go/wm-smoke
Change-Id: I6ff55bedad29df2ae3d00cdd18a748c052fae750
Dan Sandler [Thu, 28 Jun 2018 04:10:03 +0000 (21:10 -0700)]
Merge "P is for PAINT." into pi-dev
am:
bed68535c0
Change-Id: Ibf1f14dea6efd09f5d2777d663bdfa69254d572d
TreeHugger Robot [Thu, 28 Jun 2018 03:49:05 +0000 (03:49 +0000)]
Merge "P is for PAINT." into pi-dev
Atanas Kirilov [Thu, 28 Jun 2018 03:36:15 +0000 (20:36 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f am:
0f4152e815 am:
387e0bf842
am:
2f2e754b6a
Change-Id: I7bc2c16a41cab48e0d0d0ade0f636ac1e2eead7a
TreeHugger Robot [Thu, 28 Jun 2018 03:28:32 +0000 (03:28 +0000)]
Merge "Stop invoke initAppOps in Camera default constructor."
Atanas Kirilov [Thu, 28 Jun 2018 03:25:02 +0000 (20:25 -0700)]
[automerger skipped] Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8 am:
ab3235ad5b am:
5fb8ac2010
am:
97238d791f -s ours
Change-Id: Icf3a98f193be43b1b82e88c2ec88fe1aa3f33093
Atanas Kirilov [Thu, 28 Jun 2018 03:16:08 +0000 (20:16 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c am:
2b8be3932b am:
d63cfc9261
am:
3d058ea5a0
Change-Id: Ice3a7ee74d4a4bf18ba6fa8a00022ecdd9eaa386
Atanas Kirilov [Thu, 28 Jun 2018 03:02:39 +0000 (20:02 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee am:
1b67b798cf -s ours am:
1028b26d46 -s ours
am:
b88cac5977 -s ours
Change-Id: I0d8cecbe603a931fa874de932da94fc566bba728
TreeHugger Robot [Thu, 28 Jun 2018 02:44:32 +0000 (02:44 +0000)]
Merge "P is for PAINT."
Atanas Kirilov [Thu, 28 Jun 2018 02:15:59 +0000 (19:15 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f am:
0f4152e815
am:
387e0bf842
Change-Id: I6ed4b999bfc3b434971609088457aa56d042db99
Atanas Kirilov [Thu, 28 Jun 2018 01:55:18 +0000 (18:55 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8 am:
ab3235ad5b
am:
5fb8ac2010
Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db
Atanas Kirilov [Thu, 28 Jun 2018 01:48:55 +0000 (18:48 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2 am:
245cc0559f
am:
0f4152e815
Change-Id: I49e413e32d9db706eaa5a56fc84f9998a47b8a9e
Atanas Kirilov [Thu, 28 Jun 2018 01:45:18 +0000 (18:45 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c am:
2b8be3932b
am:
d63cfc9261
Change-Id: Id96bf7c84b589849d1436cb2c926df9e8d0d09dd
Atanas Kirilov [Thu, 28 Jun 2018 01:35:46 +0000 (18:35 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e am:
dcc95b94f8
am:
ab3235ad5b
Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3
Kevin Chyn [Thu, 28 Jun 2018 01:35:06 +0000 (18:35 -0700)]
Change resource name to be consistent with fingerprint
Fixes:
110906179
Test: builds
Change-Id: Id8a786c961ec8e11ebdc7377dff9c82200ba797a
Atanas Kirilov [Thu, 28 Jun 2018 01:29:36 +0000 (18:29 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c am:
00bf4c5b5c
am:
2b8be3932b
Change-Id: I2ad28e6a718946be431fcda0cbb8efa719b46db3
Atanas Kirilov [Thu, 28 Jun 2018 01:27:10 +0000 (18:27 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2
am:
245cc0559f
Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0
Atanas Kirilov [Thu, 28 Jun 2018 01:10:46 +0000 (18:10 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee am:
1b67b798cf -s ours
am:
1028b26d46 -s ours
Change-Id: I78396616a3fa15cdf91bcee465bc4027be201898
Atanas Kirilov [Thu, 28 Jun 2018 00:57:17 +0000 (17:57 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
am:
8b047ec8a2
Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2
Atanas Kirilov [Thu, 28 Jun 2018 00:37:57 +0000 (17:37 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e
am:
dcc95b94f8
Change-Id: I23209ea505140a48177b1b4fe78d36699240653e
Atanas Kirilov [Thu, 28 Jun 2018 00:25:10 +0000 (17:25 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
am:
c6dbcc137e
Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a
Atanas Kirilov [Thu, 28 Jun 2018 00:21:25 +0000 (17:21 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c
am:
00bf4c5b5c
Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7
TreeHugger Robot [Thu, 28 Jun 2018 00:09:54 +0000 (00:09 +0000)]
Merge "Reduce overview proxy connection backoff time to hide back faster"
Atanas Kirilov [Thu, 28 Jun 2018 00:09:53 +0000 (17:09 -0700)]
[automerger skipped] Merge "Backporting of b/
77821568" into oc-dev am:
9774459633 am:
f3f6e2f9ee
am:
1b67b798cf -s ours
Change-Id: I1f209b583519e73c0912db7583b34324003a5526
Kevin Chyn [Thu, 28 Jun 2018 00:02:19 +0000 (00:02 +0000)]
Merge "Add kchyn to SystemUI owners"
TreeHugger Robot [Thu, 28 Jun 2018 00:01:59 +0000 (00:01 +0000)]
Merge "Update notification settings Javadoc links."
Chavi Weingarten [Thu, 28 Jun 2018 00:00:24 +0000 (00:00 +0000)]
Merge "Don't keep current IME target if it's being removed."
Dongwon Kang [Wed, 27 Jun 2018 23:55:48 +0000 (16:55 -0700)]
Clean up libmedia2_jni Android.bp
- Remove unnecessary source files
- Use shared-lib if there is NDK or NDK-compliant version
Test: build
Bug:
63934228
Change-Id: I23347678d53f43e6732065270d52e28d753e15bc
Atanas Kirilov [Wed, 27 Jun 2018 23:56:45 +0000 (16:56 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
am:
000036eb4c
Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0
Atanas Kirilov [Wed, 27 Jun 2018 23:56:36 +0000 (16:56 -0700)]
Merge "Backporting of b/
77821568" into oc-dev am:
9774459633
am:
f3f6e2f9ee
Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0
Atanas Kirilov [Wed, 27 Jun 2018 23:42:36 +0000 (16:42 -0700)]
Merge "Backporting of b/
77821568" into oc-dev
am:
9774459633
Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f skipped:
c3e741e530
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd skipped:
430c4395a3
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
RESTRICT AUTOMERGE: Backporting of b/
77821568
Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]
Merge "Backporting of b/
77821568" into oc-dev
Kevin Chyn [Wed, 27 Jun 2018 23:19:33 +0000 (16:19 -0700)]
Add kchyn to SystemUI owners
Test: builds
Change-Id: I2774c26b01085180d5a9cbe3e578f73d48c869e9
Kurt Marcinkiewicz [Wed, 27 Jun 2018 23:10:55 +0000 (23:10 +0000)]
Merge "Fix NPE when country is absent from user's locale"
Dan Sandler [Thu, 3 May 2018 00:01:38 +0000 (20:01 -0400)]
P is for PAINT.
Bug:
109925861
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Merged-In: Ic3020007c716be264e9523d6dbae9e13a95fa571
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
Dan Sandler [Thu, 3 May 2018 00:01:38 +0000 (20:01 -0400)]
P is for PAINT.
Bug:
109925861
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
Tyler Gunn [Wed, 27 Jun 2018 22:48:44 +0000 (15:48 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
af228ca978 am:
206bacb18b
am:
05902faa8b
Change-Id: I1b1c55250e2f3e636e2dea6e35cca7c08051b4b7
Siddharth Ray [Mon, 18 Jun 2018 01:28:44 +0000 (18:28 -0700)]
Fix in Wifi activity updates
When Wifi firmware resets link layer stats, it sometimes returns a value
for On time which is much larger than the duration of the report.
On time = Idle time + Rx time + Tx time.
This change prevents those errors from affecting Wifi power metrics.
BUG:
110325882
Test:
adb shell dumpsys batterystats
WiFi Scan time: 12s 302ms
WiFi Idle time: 5m 48s 634ms
WiFi Rx time: 24s 232ms
WiFi Tx time: 10s 510ms
Change-Id: I7b69fc728b275f89154dd0c1d7382576ebfadc29
Tyler Gunn [Wed, 27 Jun 2018 22:38:13 +0000 (15:38 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
af228ca978
am:
206bacb18b
Change-Id: I66364e0e5213410595ec110c422125b2c93f0411
Matthew Ng [Wed, 27 Jun 2018 22:32:09 +0000 (15:32 -0700)]
Reduce overview proxy connection backoff time to hide back faster
Switching to guest user would show a dialog to continue or start the
guest profile again and this would show the back button. At the same
time the connection is being established with the launcher again. First
time would sometimes fail causing a timeout of 5 secs before trying to
reconnect again. During the 5 sec timeout the back button would continue
to be visible until it reconnects and hides it. If this is reduced to 1
sec then reconnection would occur quicker and as a result hide the back
button.
Fixes:
109662462
Test: switch to guest user, immediately press continue and wait for back
button disappear
Change-Id: Id81b7f175834fb1eae8a0787674bbc130c91a5a2
Jeff Sharkey [Wed, 27 Jun 2018 22:33:07 +0000 (22:33 +0000)]
Merge "Give StrictMode more bits to work with."
Tyler Gunn [Wed, 27 Jun 2018 22:28:10 +0000 (15:28 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
af228ca978
Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
TreeHugger Robot [Wed, 27 Jun 2018 22:26:26 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE"
OSDN Git Service
