OSDN Git Service
TreeHugger Robot [Sat, 30 Jun 2018 00:26:35 +0000 (00:26 +0000)]
Merge "Make scroll bars more noticeable on round screens."
TreeHugger Robot [Sat, 30 Jun 2018 00:21:40 +0000 (00:21 +0000)]
Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)"
Wale Ogunwale [Wed, 27 Jun 2018 12:14:34 +0000 (05:14 -0700)]
Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)
Moved more stuff related to activities out of the current service to the new one.
Bug:
80414790
Fixes:
110988007
Test: Existing tests pass.
Change-Id: Iceed1da8a7441a26d11efebc6d9f692fd053bc7f
Nathan Harold [Fri, 29 Jun 2018 22:59:58 +0000 (15:59 -0700)]
Merge changes I0d635067,I1424973b am:
4d7a010983 am:
3b08d8ff77
am:
dcfa685cad
Change-Id: I683f6f829ee106196eb266b5bdb7ee450c259c02
Shep Shapard [Fri, 29 Jun 2018 22:54:58 +0000 (22:54 +0000)]
Merge "Fix invisible scroll thumb blocks clicks."
Nathan Harold [Fri, 29 Jun 2018 22:46:45 +0000 (15:46 -0700)]
Merge changes I0d635067,I1424973b am:
4d7a010983
am:
3b08d8ff77
Change-Id: I323c57f0ad262a5875fcac7370dfb75d116f4bca
Nathan Harold [Fri, 29 Jun 2018 22:39:19 +0000 (15:39 -0700)]
Merge changes I0d635067,I1424973b
am:
4d7a010983
Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
Amit Mahajan [Fri, 29 Jun 2018 22:07:03 +0000 (15:07 -0700)]
[automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am:
c8eb9ef591 am:
d7a5190868 -s ours
am:
0c50371d12 -s ours
Change-Id: I09a6f75b9884a7c1ecc3a87502f1ace87210df97
Amit Mahajan [Fri, 29 Jun 2018 21:43:38 +0000 (14:43 -0700)]
[automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am:
c8eb9ef591
am:
d7a5190868 -s ours
Change-Id: Id98081b344dd9bd9376adcbcff23f7d1506c35af
TreeHugger Robot [Fri, 29 Jun 2018 21:26:24 +0000 (21:26 +0000)]
Merge "Skip hardware bitmaps if canvas does not support hardware acceleration"
Nathan Harold [Fri, 29 Jun 2018 21:23:26 +0000 (21:23 +0000)]
Merge changes I0d635067,I1424973b
* changes:
Simplify equals() method of ServiceState
Update ServiceState.hashCode()
Amit Mahajan [Fri, 29 Jun 2018 21:05:51 +0000 (14:05 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am:
c8eb9ef591
Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
TreeHugger Robot [Fri, 29 Jun 2018 20:30:51 +0000 (20:30 +0000)]
Merge "Used APN type instead of APN id"
Treehugger Robot [Fri, 29 Jun 2018 19:55:16 +0000 (19:55 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
TreeHugger Robot [Fri, 29 Jun 2018 19:36:11 +0000 (19:36 +0000)]
Merge "[NR] Remove unnecessary boolean change, update var names"
Lucas Dupin [Fri, 29 Jun 2018 18:47:32 +0000 (11:47 -0700)]
Merge "AOD animation polish" into pi-dev am:
704a0d6174
am:
e9861964bf
Change-Id: I135ff3a852d2b1d2288add1c0c94bbf7313d1aec
Lucas Dupin [Fri, 29 Jun 2018 18:40:43 +0000 (11:40 -0700)]
Merge "AOD animation polish" into pi-dev
am:
704a0d6174
Change-Id: Ia5662e819573ba45707f4f2dd4f166c64d87154e
Lucas Dupin [Fri, 29 Jun 2018 18:27:46 +0000 (18:27 +0000)]
Merge "AOD animation polish" into pi-dev
Amit Mahajan [Tue, 5 Jun 2018 23:27:32 +0000 (16:27 -0700)]
Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug:
80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit
22e89f4773d9cbc8f5911b65b2dae3e3add7bdb6)
shepshapard [Mon, 25 Jun 2018 20:42:11 +0000 (13:42 -0700)]
Fix invisible scroll thumb blocks clicks.
The current issue is that Views that have either the horizontal or
vertical scroll bars enabled will intercept mouse interactions that
entire the region where the scrolling thumb would be even if the View
cannot actually scroll because it's content isn't larger than it.
This is fixed by only intercepting mouse interactions in the scroll
thumb region if there is something to scroll.
Bug:
110375792
Test: None yet
Change-Id: Ib638b4ac88375f55bc80ba2a66d945a16ecd6d22
Amit Mahajan [Fri, 29 Jun 2018 17:53:14 +0000 (10:53 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev am:
fffc308084
am:
93c577b224
Change-Id: Ie635c49b097d758c96e882249a4b0ad61c85b730
Jack Yu [Tue, 26 Jun 2018 00:40:02 +0000 (17:40 -0700)]
Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.
Test: Telephony sanity tests + unit tests
Bug:
77511388
Change-Id: If41845604ea14f36272262da110d682eea0d5451
Amit Mahajan [Fri, 29 Jun 2018 17:34:33 +0000 (10:34 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
am:
fffc308084
Change-Id: I813c193b1c9d68f524ad74d21f0616516edc18d6
TreeHugger Robot [Fri, 29 Jun 2018 17:23:13 +0000 (17:23 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
Danny Epstein [Wed, 27 Jun 2018 20:04:14 +0000 (13:04 -0700)]
Make scroll bars more noticeable on round screens.
Increase alpha from 15 to 30% for the track and use Google Material
Grey 200 for the thumb. Fix the geometry so that the track and thumb
don't extend off the edge of the screen.
Bug:
80258942
Change-Id: I43e603e5fffb8a05f486af35194c801060dd0b51
(cherry picked from commit
97b00cbc039a090659aed75e47a172a70222b02f)
TreeHugger Robot [Fri, 29 Jun 2018 16:04:31 +0000 (16:04 +0000)]
Merge "Clarify WebView's lack of plugin support."
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
Matthew Ng [Thu, 28 Jun 2018 20:05:30 +0000 (13:05 -0700)]
Skip hardware bitmaps if canvas does not support hardware acceleration
Test: use go/web-hv on nav bar
Change-Id: Id7d5f01aa0dbe9d05d0526726f64fc5233b9f563
Fixes:
110949540
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
Torne (Richard Coles) [Thu, 28 Jun 2018 23:33:27 +0000 (19:33 -0400)]
Clarify WebView's lack of plugin support.
Update docs to clarify that plugins are in fact not supported from K
onward and that enabling them doesn't do anything.
Test: m offline-sdk-docs
Change-Id: I8678ea716be0adc4cd3a6fae1b4776e312ec29e0
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
Lucas Dupin [Thu, 28 Jun 2018 18:09:09 +0000 (11:09 -0700)]
AOD animation polish
Change-Id: I03220e30d52aadc5aab8edddf759debd3302c95d
Fixes:
110227946
Test: visual
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
Nathan Harold [Thu, 28 Jun 2018 00:21:17 +0000 (17:21 -0700)]
Simplify equals() method of ServiceState
For whatever reason, ServiceState used a
somewhat-convoluted check for null and
class type. Updating to use a canonical
and brief approach.
Bug:
8675309
Test: compilation
Change-Id: I0d635067a06093affff478e13c28bbbe2bfda7df
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