OSDN Git Service
Antony Sargent [Mon, 11 Jun 2018 21:30:21 +0000 (14:30 -0700)]
Remove preference_category_material_settings.xml
This layout was moved to the support library as a part of the work for
b/
64689839, so we don't need a copy of it in SettingsLib anymore.
Bug:
110037570
Test: compile (all consumers of SettingsLib should no longer be
referencing this layout)
Change-Id: I084898a35f18427ca15c8e103af34b3e90b9a85e
Mike Digman [Tue, 12 Jun 2018 23:28:47 +0000 (16:28 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev am:
f8dc8e378a
am:
cec13f27af
Change-Id: I1bb3fdcff165ffdcd389ba2aa047e19479345bff
Android Build Merger (Role) [Tue, 12 Jun 2018 22:57:51 +0000 (22:57 +0000)]
Merge "Merge "Remove internal ApnSetting." into pi-dev-plus-aosp am:
1969c54ae2"
Pengquan Meng [Tue, 12 Jun 2018 22:55:11 +0000 (15:55 -0700)]
Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
am:
1969c54ae2
Change-Id: Ifaa873daa4bf60e5ddc9b8acef8b826ac787582a
TreeHugger Robot [Tue, 12 Jun 2018 22:52:52 +0000 (22:52 +0000)]
Merge "Moved some activities implementation to ActivityTaskManagerService (2/n)"
TreeHugger Robot [Tue, 12 Jun 2018 22:16:26 +0000 (22:16 +0000)]
Merge "Fix issue #
110010842: 875481 hi - Android - [Source] Context..."
TreeHugger Robot [Tue, 12 Jun 2018 22:09:29 +0000 (22:09 +0000)]
Merge "Get rid of unnecessary todo"
TreeHugger Robot [Tue, 12 Jun 2018 22:01:23 +0000 (22:01 +0000)]
Merge "Dump keyguard status bar state"
Mike Digman [Tue, 12 Jun 2018 21:54:57 +0000 (14:54 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am:
f8dc8e378a
Change-Id: If0731ddfa7fb95e4b810ca80115b4d1c8714a875
Android Build Merger (Role) [Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)]
[automerger] Merge "Allow unsuspending critical packages" into pi-dev am:
5c4b2f6e08 am:
cf6482f105
Change-Id: I8d7314e56c750b150216cef734a2939e4cbc0752
Suprabh Shukla [Tue, 12 Jun 2018 21:38:49 +0000 (14:38 -0700)]
Merge "Allow unsuspending critical packages" into pi-dev
am:
5c4b2f6e08
Change-Id: If318c9e01b240b795c36596167a330297c7fb5d7
Pengquan Meng [Tue, 12 Jun 2018 21:38:22 +0000 (21:38 +0000)]
Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jun 2018 21:33:37 +0000 (21:33 +0000)]
[automerger] Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev am:
f8dc8e378a am:
39880861d4
Change-Id: I8849835d253ec8fbe85d0d0c3aab628a28ea4870
Mike Digman [Tue, 12 Jun 2018 21:32:59 +0000 (14:32 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am:
f8dc8e378a
Change-Id: Ife59bc02c30446efe6764fcfd5e8813c46e1543f
TreeHugger Robot [Tue, 12 Jun 2018 21:27:45 +0000 (21:27 +0000)]
Merge "Minor autofill fixes."
TreeHugger Robot [Tue, 12 Jun 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Allow unsuspending critical packages" into pi-dev
Ryan Mitchell [Tue, 12 Jun 2018 20:51:33 +0000 (20:51 +0000)]
Merge "AAPT2: Fix raw string parsing"
TreeHugger Robot [Tue, 12 Jun 2018 20:43:49 +0000 (20:43 +0000)]
Merge "Do not re-inflate footer and empty shade views"
Wale Ogunwale [Mon, 30 Apr 2018 20:55:07 +0000 (13:55 -0700)]
Moved some activities implementation to ActivityTaskManagerService (2/n)
Second step in unifying the window hierarchy that is currently split
within AM and WM packages. We move some of the API implementation for
activities from ActivityManagerService.java to
ActivityTaskManagerService.java.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I23dcd924493d8ad1e0b6e3a55386fd72b0146605
Mike Digman [Tue, 12 Jun 2018 20:27:00 +0000 (20:27 +0000)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
Neil Fuller [Tue, 12 Jun 2018 20:22:16 +0000 (13:22 -0700)]
[automerger skipped] Fix a syntax error in SystemServiceRegistry am:
10e276a24d -s ours
am:
d127e78eb2 -s ours
Change-Id: Ic2dc5fb0965b384daed83b6dbc3fbe3f28470fc0
Neil Fuller [Tue, 12 Jun 2018 20:11:34 +0000 (13:11 -0700)]
[automerger skipped] Fix a syntax error in SystemServiceRegistry
am:
10e276a24d -s ours
Change-Id: I79cb70aef217c3ec4bd42f0023e009506836a191
Lucas Dupin [Tue, 12 Jun 2018 20:08:23 +0000 (13:08 -0700)]
Dump keyguard status bar state
We didn't have KeyguardStatusBarView dumps in our dumpsys,
adding more info will make our lives easier in the future.
Test: adb shell dumpsys activity service com.android.systemui
Change-Id: I07af14922501889cc15005f01463674f0651dfde
Fixes:
109899206
Beverly [Tue, 12 Jun 2018 19:53:05 +0000 (15:53 -0400)]
Get rid of unnecessary todo
Test: builds
Change-Id: I7feffec1e06112030d2e02055555684827c22fcd
TreeHugger Robot [Tue, 12 Jun 2018 19:48:18 +0000 (19:48 +0000)]
Merge "Removes deprecated EXTRA_EPHEMERAL*"
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
Android Build Merger (Role) [Tue, 12 Jun 2018 18:39:33 +0000 (18:39 +0000)]
Merge "[automerger skipped] Merge "Simple pass-through TimeDetectorService" am:
cb749e2e50 am:
415585f2a5 am:
a3aa3221bf -s ours"
Neil Fuller [Tue, 12 Jun 2018 18:39:04 +0000 (11:39 -0700)]
[automerger skipped] Merge "Simple pass-through TimeDetectorService" am:
cb749e2e50 am:
415585f2a5
am:
a3aa3221bf -s ours
Change-Id: I12a3c03fd1f1373a2d448bc9c82859869d8b9419
TreeHugger Robot [Tue, 12 Jun 2018 18:37:07 +0000 (18:37 +0000)]
Merge "Avoid showing bouncer when in a launch transition"
Selim Cinek [Tue, 12 Jun 2018 18:30:37 +0000 (11:30 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev am:
1d207b3af5
am:
8e64955636
Change-Id: I72e0d0f459ee3277bba699218802e7aa0e458707
Neil Fuller [Tue, 12 Jun 2018 18:26:56 +0000 (11:26 -0700)]
Merge "Simple pass-through TimeDetectorService" am:
cb749e2e50
am:
415585f2a5
Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7
Android Build Merger (Role) [Tue, 12 Jun 2018 18:20:00 +0000 (18:20 +0000)]
[automerger] Merge "Keeping the lockdown state in sync with the notification list" into pi-dev am:
1d207b3af5 am:
c3df03f803
Change-Id: I693e84269da5835dd072a7a29e62c00c4c909f9a
Selim Cinek [Tue, 12 Jun 2018 18:19:08 +0000 (11:19 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am:
1d207b3af5
Change-Id: I0ee8ca85bb234e86bbaba0ec7e983861b03546eb
Selim Cinek [Tue, 12 Jun 2018 18:19:05 +0000 (11:19 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am:
1d207b3af5
Change-Id: Ifd324519350b2aaac9debbf7c89338af8e139a42
TreeHugger Robot [Tue, 12 Jun 2018 18:18:48 +0000 (18:18 +0000)]
Merge "Split interfaces and service for activities from current AM interfaces (1/n)"
Neil Fuller [Tue, 12 Jun 2018 18:17:51 +0000 (11:17 -0700)]
Merge "Simple pass-through TimeDetectorService"
am:
cb749e2e50
Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
Selim Cinek [Tue, 12 Jun 2018 18:04:01 +0000 (18:04 +0000)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
Felipe Leme [Fri, 8 Jun 2018 23:26:39 +0000 (16:26 -0700)]
Minor autofill fixes.
- Removed unused arg from RemoteFillService.FillServiceCallbacks methods.
- Changed a FillUi error to WTF.
- Removed unused imports.
- Removed unused variables.
- Dump afm.mIdShowFillUi.
Bug: none
Test: atest CtsAutoFillServiceTestCases
Change-Id: I12784a1a5ffbe3b2ced5bdb27c5fd3716aa876ee
TreeHugger Robot [Tue, 12 Jun 2018 17:03:12 +0000 (17:03 +0000)]
Merge "Add isConnectedHearingAidDevice function to check if it supports Hearing Aid profile"
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"
TreeHugger Robot [Tue, 12 Jun 2018 16:52:20 +0000 (16:52 +0000)]
Merge "Only call getActiveAdminForCallerLocked when holding a lock"
Irina Dumitrescu [Tue, 12 Jun 2018 16:24:11 +0000 (16:24 +0000)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
TreeHugger Robot [Tue, 12 Jun 2018 16:06:34 +0000 (16:06 +0000)]
Merge "Use disableForUser in StatusBarManager"
Jeff Sharkey [Tue, 12 Jun 2018 16:00:20 +0000 (16:00 +0000)]
Merge "Annotate methods with SET_TIME and SET_TIME_ZONE."
Patrick [Mon, 11 Jun 2018 17:13:52 +0000 (10:13 -0700)]
Removes deprecated EXTRA_EPHEMERAL*
This change removes deprecated and unused Intent extra names that were
replaced in P with EXTRA_INSTANT* equivalents.
Change-Id: Idd57b9db5896eda24349d01c0d7557f2d4e820ea
Fixes:
72700831
Test: build succeeds and instant app launches with installer on system image
Pavel Grafov [Tue, 12 Jun 2018 13:00:23 +0000 (14:00 +0100)]
Only call getActiveAdminForCallerLocked when holding a lock
+ factored out all device-owner checking calls
+ some profile owner checks
Fixes:
110040849
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testSetTime
Test: create a profile with TestDPS, it sets profile name.
Change-Id: I5fec70505d089bd7dcea80eae3df9c0f2b7094dd
Chalard Jean [Tue, 12 Jun 2018 14:39:54 +0000 (07:39 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am:
6c0106b57f am:
85bae863f5
am:
d118c2b444
Change-Id: I19197e4bdc44d46e31c1e931e0e7b252f0b6bfa4
Neil Fuller [Tue, 12 Jun 2018 14:33:46 +0000 (07:33 -0700)]
[automerger skipped] resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master am:
79d42a61e4
am:
267ef30c8b -s ours
Change-Id: I9b37dbed541cf29bba751f2e95f4fa6939bfb92a
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit
24836bfb1564b1f98c322108a924965a8dbbee4f)
Chalard Jean [Tue, 12 Jun 2018 14:04:45 +0000 (07:04 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am:
6c0106b57f
am:
85bae863f5
Change-Id: Ica8e290909a34976e00bebbb622dd49d8f0d6b8d
Chalard Jean [Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am:
6c0106b57f
Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
yuemingw [Mon, 9 Apr 2018 15:41:54 +0000 (16:41 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I9757ef4aae269d828c98a7363c98629c9be74846
Neil Fuller [Tue, 12 Jun 2018 13:36:14 +0000 (06:36 -0700)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
am:
79d42a61e4
Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
Irina Dumitrescu [Fri, 8 Jun 2018 18:36:34 +0000 (19:36 +0100)]
Add Keystore get option that supresses caught exceptions warnings.
This is useful when the caught exceptions are not informative and they
act as a red herring in the adb logs.
Bug:
109791294
Test: call this method in the VpnSettings and manually navigate to
adding a new VPN by searching for VPN in settings and then pressing '+'.
Change-Id: I4bc86e3ea5b11027090fd3a27dc7455557cf66ab
Neil Fuller [Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
Chalard Jean [Tue, 12 Jun 2018 12:23:59 +0000 (12:23 +0000)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
[PT06] Move setGlobalProxy into ProxyTracker
[PT05] Move sendProxyBroadcast into ProxyTracker.
[PT04] Move PacManager into ProxyTracker.
[PT03] Move some more code into ProxyTracker.
[PT02] Move static methods to ProxyTracker
[PT01] Introduce ProxyTracker
Remove a useless parameter.
Small cleanup of Network.
Cleanup of LinkProperties.
Jorim Jaggi [Tue, 12 Jun 2018 12:23:55 +0000 (12:23 +0000)]
Merge "Enable expanding of status bar just below the notch"
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker
Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110
Chalard Jean [Thu, 7 Jun 2018 10:30:29 +0000 (19:30 +0900)]
[PT05] Move sendProxyBroadcast into ProxyTracker.
Test: runtest
Change-Id: I2c149d29d4b75d3978021b940b6bc58f677b8d17
Chalard Jean [Thu, 7 Jun 2018 10:20:08 +0000 (19:20 +0900)]
[PT04] Move PacManager into ProxyTracker.
Test: runtest
Change-Id: I45d22857459fe1746d484ac04f8d5cd81fc61835
Chalard Jean [Thu, 7 Jun 2018 09:02:37 +0000 (18:02 +0900)]
[PT03] Move some more code into ProxyTracker.
Add finals and annotations. Remove comments that have lost their
context (they were in the context of disabling a permission check
that had been added, but constituted an API change that would not
serve any real purpose).
Test: runtest
Change-Id: I1f879b2c105d2127072b88233d72097a0d78fe14
Chalard Jean [Thu, 7 Jun 2018 08:41:29 +0000 (17:41 +0900)]
[PT02] Move static methods to ProxyTracker
No logic changes. Only changes are adding nullability annotations,
final modifiers, and adding an s in a comment.
Test: runtests
Change-Id: If4986a25bb36819de8ff459c4c0439c56d4e5a50
Chalard Jean [Thu, 7 Jun 2018 07:44:04 +0000 (16:44 +0900)]
[PT01] Introduce ProxyTracker
The goal of this is to simplify ConnectivityService by reducing
the amount of code it contains. This is small enough to be obviously
correct and followup changes will move code into this class.
Test: runtest
Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb
Chalard Jean [Thu, 7 Jun 2018 07:11:34 +0000 (16:11 +0900)]
Remove a useless parameter.
This argument is useless because all its callers pass the same
value : false.
Test: runtest
Change-Id: Id921caa4ffadef535a5bbcfea052283a07320b28
Chalard Jean [Thu, 7 Jun 2018 04:46:52 +0000 (13:46 +0900)]
Small cleanup of Network.
Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a
Chalard Jean [Thu, 7 Jun 2018 04:27:00 +0000 (13:27 +0900)]
Cleanup of LinkProperties.
Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5
Neil Fuller [Tue, 12 Jun 2018 09:50:32 +0000 (09:50 +0000)]
Merge "Minimum viable TimeDetectorService"
Neil Fuller [Tue, 12 Jun 2018 09:49:33 +0000 (09:49 +0000)]
Merge "Simple pass-through TimeDetectorService"
timhypeng [Fri, 25 May 2018 06:23:44 +0000 (14:23 +0800)]
Add isConnectedHearingAidDevice function to check if it supports Hearing Aid
profile
Bug:
79553082
Test: make -j50 RunSettingsLibRoboTests
Change-Id: I2950f63c4a95d692b77cfffeacc9d1d319243e0d
Robin Lee [Tue, 12 Jun 2018 09:06:12 +0000 (09:06 +0000)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable"
Winson Chung [Tue, 12 Jun 2018 08:34:33 +0000 (01:34 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am:
b2dac061bb
am:
ce2b842a02
Change-Id: I3af2aca768ffbe310b16fdbc379c77b1490710f1
Jean-Michel Trivi [Tue, 12 Jun 2018 08:23:08 +0000 (01:23 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev am:
8a12361b8c
am:
257b52411c
Change-Id: I6ddfa299959df7c1e61137853c1c7c40ce3701d1
Winson Chung [Tue, 12 Jun 2018 07:34:56 +0000 (00:34 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Ia09141c88e964ccfafe75fa6a0d0c7e19ddeadd4
Android Build Merger (Role) [Tue, 12 Jun 2018 07:13:11 +0000 (07:13 +0000)]
[automerger] Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am:
b2dac061bb am:
5d0c692fc8
Change-Id: I1498fe2942980126a28794c82035b54f234365a2
Winson Chung [Tue, 12 Jun 2018 07:12:28 +0000 (00:12 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Iacab2fc896a9fb7a8313926b0f6dfc5355d468a2
Winson Chung [Tue, 12 Jun 2018 06:45:15 +0000 (06:45 +0000)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
TreeHugger Robot [Tue, 12 Jun 2018 06:12:22 +0000 (06:12 +0000)]
Merge "Only keep methods with correct signature for view/menu click"
Android Build Merger (Role) [Tue, 12 Jun 2018 05:42:32 +0000 (05:42 +0000)]
[automerger] Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev am:
8a12361b8c am:
f3e07916bb
Change-Id: I31d12210e143026eb1467f16920581a199d0fd1f
Jean-Michel Trivi [Tue, 12 Jun 2018 05:41:51 +0000 (22:41 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Iba3c61d775b47919a63a47982c0197d125dddf54
Jean-Michel Trivi [Tue, 12 Jun 2018 05:18:53 +0000 (22:18 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd
TreeHugger Robot [Tue, 12 Jun 2018 03:59:07 +0000 (03:59 +0000)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
Bill Yi [Tue, 12 Jun 2018 03:58:25 +0000 (20:58 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1 am:
f8fe538f07
am:
e10d2c53fa
Change-Id: I9b901e3af99b51a0eba938674f65084b67f8db08
Bill Yi [Tue, 12 Jun 2018 03:47:58 +0000 (20:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours am:
9b70877ea8 -s ours
am:
7eed4a4f60 -s ours
Change-Id: I7ca7d36efef3c69bf0830e0b46d2d87e6aa084ca
Bill Yi [Tue, 12 Jun 2018 03:40:40 +0000 (20:40 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2 am:
88db3b5aae
am:
e7e9e5330e
Change-Id: Ia88337362d28b2fc73b7734d6d52d8d273eb3146
Bill Yi [Tue, 12 Jun 2018 03:29:45 +0000 (20:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours am:
7609e23612 -s ours
am:
8dbbb70c59 -s ours
Change-Id: Ia45f2134aa4e2af731fe565888609e0dfd8dad09
TreeHugger Robot [Tue, 12 Jun 2018 02:43:20 +0000 (02:43 +0000)]
Merge "Log when a autofill is disabled in a view because of a parent's importance."
Bill Yi [Tue, 12 Jun 2018 02:36:52 +0000 (19:36 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2 am:
995c542d0c
am:
62fcf822c0
Change-Id: I548b57207b0794152d6ccd9a1c9e9d6ce415627d
Bill Yi [Tue, 12 Jun 2018 02:25:50 +0000 (19:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours am:
7cea26fc9e -s ours
am:
043a6afff6 -s ours
Change-Id: I47ca39857a06da963a032f03b0144c910872119d
Bill Yi [Tue, 12 Jun 2018 02:18:23 +0000 (19:18 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30 am:
6dbef2a740
am:
10b5ae6440
Change-Id: I587dd6c49c89a3309ff0edd0db7752bdd3a91fc9
Bill Yi [Tue, 12 Jun 2018 02:09:11 +0000 (19:09 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1
am:
f8fe538f07
Change-Id: I5b5360c99aeb67e14900d178f11faf435b7c42a3
Bill Yi [Tue, 12 Jun 2018 02:07:25 +0000 (19:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours am:
287d484b23 -s ours
am:
1ec3fa657f -s ours
Change-Id: I6854c3abef4e5ea6b69b3e691dc72975f93b02a6
Brad Ebinger [Tue, 12 Jun 2018 02:04:52 +0000 (19:04 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC" am:
0be0692691 -s ours am:
b57dfe26cf -s ours
am:
6145aa4aa1 -s ours
Change-Id: Ifa7b500931ebe6f3387f18b62ce043ed52a1dadb
Bill Yi [Tue, 12 Jun 2018 01:59:28 +0000 (18:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours
am:
9b70877ea8 -s ours
Change-Id: Iac4584e21e939ea6f770a64d7e5c16a561741bf8
Nan Zhang [Tue, 12 Jun 2018 01:57:41 +0000 (18:57 -0700)]
Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp
am:
b7a46a7ec5
Change-Id: I58b0993effac259938c4f067188bb44ff1fa72cd
Bill Yi [Tue, 12 Jun 2018 01:52:55 +0000 (18:52 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2
am:
88db3b5aae
Change-Id: Ia79761d8fb5b1bbdad7a0230dd5d1daef998ead2
Bill Yi [Tue, 12 Jun 2018 01:43:20 +0000 (18:43 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours
am:
7609e23612 -s ours
Change-Id: I556cc2268f3feb0344b21be2f4a57cd15627047d
Suprabh Shukla [Mon, 11 Jun 2018 22:11:01 +0000 (15:11 -0700)]
Allow unsuspending critical packages
PackageManager prevents certain packages from being suspended to ensure
device is in a sane state. It should not disallow unsuspening these
packages for the same reason.
Test: Existing tests:
atest FrameworksServicesTests:SuspendPackagesTest
Manually, changed the default dialer, then
adb shell pm suspend com.android.dialer
change the default dialer to com.android.dialer, then
adb shell pm unsuspend com.android.dialer
should succeeed.
Bug:
79846500
Change-Id: Ie198f61bf3b092e497f978e60a27f9d52cdda9c7
Bill Yi [Tue, 12 Jun 2018 01:36:57 +0000 (18:36 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2
am:
995c542d0c
Change-Id: I267178d0ab2cf05abdc5d685e139f05cbcc427ca
TreeHugger Robot [Tue, 12 Jun 2018 01:30:18 +0000 (01:30 +0000)]
Merge "Improve tests for ProGuard rules, add transition tests"
Bill Yi [Tue, 12 Jun 2018 01:27:17 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours
am:
7cea26fc9e -s ours
Change-Id: I3856a4767bab27699a68b765287e26b689a3906d
OSDN Git Service
