OSDN Git Service
Philip P. Moltmann [Fri, 12 Oct 2018 23:43:11 +0000 (23:43 +0000)]
Merge "Make PermissionManager use lists"
TreeHugger Robot [Fri, 12 Oct 2018 23:26:41 +0000 (23:26 +0000)]
Merge "Avoid importing protos."
TreeHugger Robot [Fri, 12 Oct 2018 23:15:49 +0000 (23:15 +0000)]
Merge "Persist data to disk when system shuts down"
TreeHugger Robot [Fri, 12 Oct 2018 23:11:33 +0000 (23:11 +0000)]
Merge "Adds missing RequiresPermission annotation to Context Hub APIs"
TreeHugger Robot [Fri, 12 Oct 2018 22:09:28 +0000 (22:09 +0000)]
Merge "Revert "Revert "Check that ViewTreeObserver is alive before unregistering listener."""
Cody Northrop [Fri, 12 Oct 2018 20:32:11 +0000 (14:32 -0600)]
Revert "Rootless GPU Debug for GLES"
This reverts commit
f41625936fa788a4747fbf3e4784694ba5c6eebe.
Exempt-From-Owner-Approval: Reverting
Bug:
110883880
Test: Chrome no longer crashes
Change-Id: I70c9d4a0376b27059e7759e1b6283903c0cf168b
Selim Cinek [Fri, 12 Oct 2018 21:04:48 +0000 (21:04 +0000)]
Merge "Fix overlap between operator name and heads-up notification"
Xiangyu/Malcolm Chen [Fri, 12 Oct 2018 20:52:40 +0000 (20:52 +0000)]
Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM."
Yangster [Fri, 12 Oct 2018 16:26:16 +0000 (09:26 -0700)]
Avoid importing protos.
Test: statsd test
Fix: b/
117624077
Change-Id: I64ec8ed73c77dbff954b74882f753b90cf3ebead
TreeHugger Robot [Fri, 12 Oct 2018 20:08:40 +0000 (20:08 +0000)]
Merge "Implement launch bounds logic in Android (2/3)"
Fabian Kozynski [Fri, 12 Oct 2018 19:41:13 +0000 (19:41 +0000)]
Merge "CastTile becomes unavailable when not connected to Wifi"
Lucas Dupin [Fri, 12 Oct 2018 19:15:56 +0000 (19:15 +0000)]
Merge "Hide back button on bouncer as user swipes down"
Chen Xu [Fri, 12 Oct 2018 18:57:14 +0000 (11:57 -0700)]
Merge "refactor data/voice roaming states" am:
6bd29ab2df am:
652ec06948
am:
6169b04385
Change-Id: I921e3dd8f4c82d83d1f12657813945fbcc2e21b2
Jack He [Fri, 12 Oct 2018 18:32:41 +0000 (11:32 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am:
2ac8c8a3e2 am:
24591d2641
am:
94405bb133
Change-Id: Ie2dd54ebdd4cd71ca89d263ec738f6c4a90cfac7
Chen Xu [Fri, 12 Oct 2018 18:32:19 +0000 (11:32 -0700)]
Merge "refactor data/voice roaming states" am:
6bd29ab2df
am:
652ec06948
Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
Lei Yu [Fri, 12 Oct 2018 18:27:40 +0000 (18:27 +0000)]
Merge "Add metric id for mobile network settings"
Android Build Merger (Role) [Fri, 12 Oct 2018 18:23:08 +0000 (18:23 +0000)]
Merge "Merge "Add DumpstateOptions java implementation" am:
52502ef1a1 am:
8a9f23c8a1 am:
1d1184cf83"
Nandana Dutt [Fri, 12 Oct 2018 18:21:26 +0000 (11:21 -0700)]
Merge "Add DumpstateOptions java implementation" am:
52502ef1a1 am:
8a9f23c8a1
am:
1d1184cf83
Change-Id: I556407ee455b92e3bae34dfa603e159b99f45080
TreeHugger Robot [Fri, 12 Oct 2018 18:21:15 +0000 (18:21 +0000)]
Merge "Fix kotlinc warnings in EasterEgg."
Chen Xu [Fri, 12 Oct 2018 18:20:18 +0000 (11:20 -0700)]
Merge "refactor data/voice roaming states"
am:
6bd29ab2df
Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
Jack He [Fri, 12 Oct 2018 18:18:09 +0000 (11:18 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am:
2ac8c8a3e2
am:
24591d2641
Change-Id: Idc687ad7ea25b793f5ef12612e161e197d87679d
TreeHugger Robot [Fri, 12 Oct 2018 18:16:52 +0000 (18:16 +0000)]
Merge "Move/rename stats_enums.proto's directory/name"
Nandana Dutt [Fri, 12 Oct 2018 18:07:59 +0000 (11:07 -0700)]
Merge "Add DumpstateOptions java implementation" am:
52502ef1a1
am:
8a9f23c8a1
Change-Id: I392c2c6bdb522efa708b82174debf3a18167c0bc
Jack He [Fri, 12 Oct 2018 18:06:44 +0000 (11:06 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am:
2ac8c8a3e2
Change-Id: I8836294e7206c8e8c024f5b986c25b9cf2dd29d9
Chen Xu [Fri, 12 Oct 2018 18:02:17 +0000 (18:02 +0000)]
Merge "refactor data/voice roaming states"
Nandana Dutt [Fri, 12 Oct 2018 17:58:16 +0000 (10:58 -0700)]
Merge "Add DumpstateOptions java implementation"
am:
52502ef1a1
Change-Id: I18d5d73028a5ebfdf0ac13d141e20cc5356b61e1
Garfield Tan [Fri, 28 Sep 2018 17:06:52 +0000 (10:06 -0700)]
Implement launch bounds logic in Android (2/3)
This CL implements the biggest chunk of launch bounds logic in Android
branch and combine ActivityLaunchParamsModifier logic into
TaskLaunchParamsModifier. It left some things to be implemented:
1) It didn't yet consider persisting/recovering data;
2) It didn't implement letterboxing/pillarboxing, but according to
offline chat this should be enforced after launch bounds policies by
system;
3) Immersive mode is not yet implemented, but that's more tied to
recovering previous immersive mode and we won't launch apps to immersive
mode directly in any case;
4) No last seen non-fullscreen bounds are set if display is fullscreen,
which could be useful when display windowing mode changes from
fullscreen to freeform at later time.
There are also some topics that for sure need future discussions, so I
left them out of this CL as well:
1) App controlled apps (not only bounds specified in ActivityOptions);
2) Metadata indicating that the app prefers tablet-like bounds for
freeform windows (i.e. w/o limiting window size to Nexus 5x screen
size);
3) Fixed maximized size, which indicates that the maximized size
shouldn't be changed due to display resolution or orientation changes;
4) What to do if app requests to launch an activity without any flag
that indicates a new task should be used, but with a preferred display
ID/bounds set to a different value than its current window;
5) Should insets be considered in launch bounds (AM side) or on WM side,
IIUC freeform windows don't need to consider insets, and fullscreen
windows are covered by WM.
Our policy also has special treatment for Chrome snapped windows
(side-by-side mode in our tablet), which may not make much sense in
Android.
Bug:
113252871
Test: go/wm-smoke. Try launching some freeform windows on secondary
displays.
atest FrameworksServicesTests:TaskLaunchParamsModifierTests
atest ActivityManagerManifestLayoutTests
Change-Id: I974031725015b6283f33b9076788e7ce45134690
Treehugger Robot [Fri, 12 Oct 2018 17:35:14 +0000 (17:35 +0000)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
Nandana Dutt [Fri, 12 Oct 2018 17:31:39 +0000 (17:31 +0000)]
Merge "Add DumpstateOptions java implementation"
Robert Snoeberger [Fri, 12 Oct 2018 17:22:06 +0000 (17:22 +0000)]
Revert "Revert "Check that ViewTreeObserver is alive before unregistering listener.""
This reverts commit
4948a474ce4dd7b43edb788308d35b866173ab5a.
Reason for revert: The performance regression was caused by a different change.
Bug:
113260844
Change-Id: I0f963f04f9d90b2d6eb5937f7778e9726fc381cc
TreeHugger Robot [Fri, 12 Oct 2018 16:54:15 +0000 (16:54 +0000)]
Merge "Fix display cutout being set to size 0"
Ryan Mitchell [Fri, 12 Oct 2018 16:42:34 +0000 (16:42 +0000)]
Merge "Preserve compression of xml files in convert"
TreeHugger Robot [Fri, 12 Oct 2018 15:48:25 +0000 (15:48 +0000)]
Merge "Switch to Skia's new representation of linear gamma"
TreeHugger Robot [Fri, 12 Oct 2018 15:45:32 +0000 (15:45 +0000)]
Merge "Skip focusing on home only because user taps on it."
TreeHugger Robot [Fri, 12 Oct 2018 14:53:20 +0000 (14:53 +0000)]
Merge "ExifInterface: Fix checking possible overflow"
TreeHugger Robot [Fri, 12 Oct 2018 14:17:24 +0000 (14:17 +0000)]
Merge "LooperStats - track time to message dispatch"
TreeHugger Robot [Fri, 12 Oct 2018 12:55:27 +0000 (12:55 +0000)]
Merge "DisplayCutout: Fix NPE in deprecated constructor and add nullability annotations"
Marcin Oczeretko [Wed, 19 Sep 2018 10:01:32 +0000 (11:01 +0100)]
LooperStats - track time to message dispatch
Test: UT and manual
atest .../LooperStatsTest.java
Verified that adb shell cmd looper_stats dump produces data
with dispatch delay
Bug:
113651685
Change-Id: I44550f8c5d71848932733bd02016aa65ce7b75b3
Adrian Roos [Fri, 12 Oct 2018 11:03:56 +0000 (13:03 +0200)]
DisplayCutout: Fix NPE in deprecated constructor and add nullability annotations
Change-Id: Ib791a41e399afbd8586f6b471165185e63b93ea4
Fixes:
117590687
Test: atest DisplayCutoutTest
TreeHugger Robot [Fri, 12 Oct 2018 10:55:26 +0000 (10:55 +0000)]
Merge "Allow all system configs in /product"
Neil Fuller [Fri, 12 Oct 2018 10:36:23 +0000 (03:36 -0700)]
Merge "Remove explicit dependencies on "core" libraries" am:
18f9a2c24d am:
d252f61f66
am:
ad3947bb43
Change-Id: I4eec960d3925bd6c30ac91f072883af8fddbd825
Neil Fuller [Fri, 12 Oct 2018 10:22:04 +0000 (03:22 -0700)]
Merge "Remove explicit dependencies on "core" libraries" am:
18f9a2c24d
am:
d252f61f66
Change-Id: Ia66748d28ecb846d190b9dacb004a734c11bc54c
Neil Fuller [Fri, 12 Oct 2018 10:12:22 +0000 (03:12 -0700)]
Merge "Remove explicit dependencies on "core" libraries"
am:
18f9a2c24d
Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
Chalard Jean [Fri, 12 Oct 2018 09:58:29 +0000 (02:58 -0700)]
Merge "NetworkMonitor: add log of CaptivePortal result" am:
35d6512a5d am:
689f888627
am:
c877cf7df3
Change-Id: Ia2846d006cfd06c09e194436897b1ba6d1dc1aa6
Neil Fuller [Fri, 12 Oct 2018 09:49:03 +0000 (09:49 +0000)]
Merge "Remove explicit dependencies on "core" libraries"
Chalard Jean [Fri, 12 Oct 2018 09:48:02 +0000 (02:48 -0700)]
Merge "NetworkMonitor: add log of CaptivePortal result" am:
35d6512a5d
am:
689f888627
Change-Id: Ibe0fbec44aa4dd52646e968d94021ddda0c05d39
Chalard Jean [Fri, 12 Oct 2018 09:32:51 +0000 (02:32 -0700)]
Merge "NetworkMonitor: add log of CaptivePortal result"
am:
35d6512a5d
Change-Id: Iab6aba7e4dab0cddc68b4e7ec5386e46f83a22f6
Chalard Jean [Fri, 12 Oct 2018 08:22:20 +0000 (01:22 -0700)]
Merge "[PT13] Simple cleanup of ProxyTracker." am:
afa7fdabaa am:
0f81f1e332
am:
f13ec866af
Change-Id: I38c35b61b3d50ac320c0aa036c4886c523e27a90
Chalard Jean [Fri, 12 Oct 2018 08:12:12 +0000 (01:12 -0700)]
Merge "[PT13] Simple cleanup of ProxyTracker." am:
afa7fdabaa
am:
0f81f1e332
Change-Id: I1e643d5be6d7f791c3bbe3ba018e6ad6717e3ddb
Chalard Jean [Fri, 12 Oct 2018 07:57:35 +0000 (07:57 +0000)]
Merge "NetworkMonitor: add log of CaptivePortal result"
Chalard Jean [Fri, 12 Oct 2018 07:50:29 +0000 (00:50 -0700)]
Merge "[PT13] Simple cleanup of ProxyTracker."
am:
afa7fdabaa
Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec
Chalard Jean [Fri, 12 Oct 2018 07:34:43 +0000 (07:34 +0000)]
Merge "[PT13] Simple cleanup of ProxyTracker."
Howard Ro [Thu, 11 Oct 2018 23:03:33 +0000 (16:03 -0700)]
Move/rename stats_enums.proto's directory/name
Migrate stats_enums.proto to core/proto/android/stats/ directory for the
consistency with other enums file imported in atoms.proto
Test: mma
Change-Id: I79f068889ac5c34c6fd8c5966687669efb37d180
Nan Zhang [Fri, 12 Oct 2018 06:33:24 +0000 (23:33 -0700)]
Merge "Fix incorrect javadoc link" am:
293ab4941b am:
d96fe8ddd0
am:
ae15939492
Change-Id: I7eb88ae0987e164542acc988cd031f1da4afd376
Chalard Jean [Fri, 12 Oct 2018 06:26:37 +0000 (23:26 -0700)]
Merge "[PT12] Factor some code into ProxyTracker." am:
f24b6c77a6 am:
1a70721041
am:
4318ecef12
Change-Id: I8053a79146621f4e9f29fee42ebb7b6d247356ed
Nan Zhang [Fri, 12 Oct 2018 06:16:13 +0000 (23:16 -0700)]
Merge "Fix incorrect javadoc link" am:
293ab4941b
am:
d96fe8ddd0
Change-Id: I0331d98eb989ee429eb0ef38c448eae551130118
Chalard Jean [Fri, 12 Oct 2018 06:10:48 +0000 (23:10 -0700)]
Merge "[PT12] Factor some code into ProxyTracker." am:
f24b6c77a6
am:
1a70721041
Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b
Jeff Sharkey [Fri, 12 Oct 2018 05:59:10 +0000 (22:59 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b am:
7656e1177f -s ours am:
58d1ac473e
am:
a305fbf85e -s ours
Change-Id: Iaa330703a4dd63653210f9c64898d67c78aa2760
Nan Zhang [Fri, 12 Oct 2018 05:59:08 +0000 (22:59 -0700)]
Merge "Fix incorrect javadoc link"
am:
293ab4941b
Change-Id: Id288e51e79c867728e06caa8ee68bf28bd2dcbf5
Jovana Knezevic [Fri, 12 Oct 2018 05:57:22 +0000 (05:57 +0000)]
Merge "Adding null check for the case when user switcher is disabled (for example in retail mode)."
Jeff Sharkey [Fri, 12 Oct 2018 05:56:08 +0000 (22:56 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b am:
7656e1177f -s ours
am:
58d1ac473e
Change-Id: Ibd2f4fcb800b7a48e7b9313083c88b4441d02f7c
Chalard Jean [Fri, 12 Oct 2018 05:55:28 +0000 (22:55 -0700)]
Merge "[PT12] Factor some code into ProxyTracker."
am:
f24b6c77a6
Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c
Jeff Sharkey [Fri, 12 Oct 2018 05:53:38 +0000 (22:53 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7 am:
cef9bae62d -s ours am:
f85bd2b22d
am:
607cdde9ae -s ours
Change-Id: I6f6d542bc7bf00e851583494283eb5ea8a71c02a
Jeff Sharkey [Fri, 12 Oct 2018 05:48:20 +0000 (22:48 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7 am:
cef9bae62d -s ours
am:
f85bd2b22d
Change-Id: I60947c277004dacba0169413def7f2bf9a0d6bf6
Jeff Sharkey [Fri, 12 Oct 2018 05:20:54 +0000 (22:20 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b
am:
7656e1177f -s ours
Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
Jeff Sharkey [Fri, 12 Oct 2018 05:19:39 +0000 (22:19 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7
am:
cef9bae62d -s ours
Change-Id: I5e2cb1a4274d547cfcd18fc010063fa70f75090f
Jeff Sharkey [Fri, 12 Oct 2018 05:14:40 +0000 (22:14 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c
am:
893598cd4b
Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2
Jeff Sharkey [Fri, 12 Oct 2018 05:09:55 +0000 (22:09 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8
am:
80c65f6ce7
Change-Id: I824cd0b4b0bdb66f9762fb9123f639fe3548f164
Jeff Sharkey [Fri, 12 Oct 2018 04:59:24 +0000 (21:59 -0700)]
[automerger skipped] Merge "Merge "Recover shady content:// paths." into pi-dev am:
7402d7611c" into pi-dev-plus-aosp
am:
ff88bfdb68 -s ours
Change-Id: I21f5cecfc8ed33bc0033706798456aa96c20b19b
Jeff Sharkey [Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am:
ab80221a8c
Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
Jeff Sharkey [Fri, 12 Oct 2018 04:52:24 +0000 (21:52 -0700)]
[automerger skipped] Merge "Recover shady content:// paths." into pi-dev am:
7402d7611c
am:
83e5229ab7 -s ours
Change-Id: Iccfe4bebe4fcf56a83252e93ed8b06141eea4a54
Jeff Sharkey [Fri, 12 Oct 2018 04:51:36 +0000 (21:51 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
am:
af72f01db8
Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
Chalard Jean [Fri, 12 Oct 2018 04:29:52 +0000 (21:29 -0700)]
Merge "Add log for debugging ConnectivityManager" am:
4b48dca2e8 am:
e3c0f28a1e
am:
d55d5c2126
Change-Id: I23a34c21d05db126d8d2aacdeb700b3d2b2ed018
Treehugger Robot [Fri, 12 Oct 2018 04:26:49 +0000 (04:26 +0000)]
Merge "Fix incorrect javadoc link"
Chalard Jean [Fri, 12 Oct 2018 04:23:16 +0000 (04:23 +0000)]
Merge "[PT12] Factor some code into ProxyTracker."
Android Build Merger (Role) [Fri, 12 Oct 2018 04:22:50 +0000 (04:22 +0000)]
Merge "Merge "Recover shady content:// paths." into pi-dev am:
7402d7611c" into pi-dev-plus-aosp
Jeff Sharkey [Fri, 12 Oct 2018 04:22:04 +0000 (21:22 -0700)]
Merge "Recover shady content:// paths." into pi-dev
am:
7402d7611c
Change-Id: I499e0086df06d77d1fce3afaa86bb19a136b1ca2
Chalard Jean [Fri, 12 Oct 2018 04:21:45 +0000 (21:21 -0700)]
Merge "Add log for debugging ConnectivityManager" am:
4b48dca2e8
am:
e3c0f28a1e
Change-Id: I2d8604c172b26e474050afd45fba74dc6c2c18bc
Chalard Jean [Fri, 12 Oct 2018 04:11:51 +0000 (21:11 -0700)]
Merge "Add log for debugging ConnectivityManager"
am:
4b48dca2e8
Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0
TreeHugger Robot [Fri, 12 Oct 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Recover shady content:// paths." into pi-dev
TreeHugger Robot [Fri, 12 Oct 2018 03:16:47 +0000 (03:16 +0000)]
Merge "Hide multi-user switch on AOD"
Chalard Jean [Fri, 12 Oct 2018 03:14:48 +0000 (03:14 +0000)]
Merge "Add log for debugging ConnectivityManager"
Nan Zhang [Fri, 12 Oct 2018 03:13:39 +0000 (20:13 -0700)]
Merge "Fix the incorrect javadoc links" into pi-dev-plus-aosp
am:
83fb35ad23
Change-Id: I48248b92a2c9f3214c88c3045f67e153f21c826f
Nan Zhang [Fri, 12 Oct 2018 03:02:13 +0000 (03:02 +0000)]
Merge "Fix the incorrect javadoc links" into pi-dev-plus-aosp
TreeHugger Robot [Fri, 12 Oct 2018 02:56:57 +0000 (02:56 +0000)]
Merge "Revert "Expose the ability to resolve icon as a different app""
TreeHugger Robot [Fri, 12 Oct 2018 02:43:52 +0000 (02:43 +0000)]
Merge "Remove unnecessary assert helpers from WindowTestBase"
Lucas Dupin [Fri, 12 Oct 2018 02:23:45 +0000 (19:23 -0700)]
Hide back button on bouncer as user swipes down
Test: atest KeyguardBouncerTest
Test: go/sysui-bouncer-tests
Change-Id: I3d0fa71896be1dbe0cb433bf3bd6eecdc64e299a
Fixes:
110852045
TreeHugger Robot [Fri, 12 Oct 2018 01:56:31 +0000 (01:56 +0000)]
Merge "NotificationInfo should use the notification theme"
TreeHugger Robot [Fri, 12 Oct 2018 01:53:14 +0000 (01:53 +0000)]
Merge "MediaPlayer2: skip consecutive seeks except last one"
Lucas Dupin [Fri, 12 Oct 2018 01:48:47 +0000 (18:48 -0700)]
Hide multi-user switch on AOD
Change-Id: I630feea86bdbfa570e121df1076883b0344c9bba
Fixes:
117099631
Test: visual
TreeHugger Robot [Fri, 12 Oct 2018 01:33:46 +0000 (01:33 +0000)]
Merge "Revert "Check that ViewTreeObserver is alive before unregistering listener.""
Sundong Ahn [Fri, 12 Oct 2018 01:25:52 +0000 (18:25 -0700)]
[automerger skipped] Merge "Add the metalava_enabled property" am:
69251fca46 am:
83a2bc6a3b -s ours
am:
66923b2fe9 -s ours
Change-Id: I3cbddc6d5127ccbdfeab0c5941a7f27fcfc4b648
Sundong Ahn [Fri, 12 Oct 2018 01:16:00 +0000 (18:16 -0700)]
[automerger skipped] Merge "Add the metalava_enabled property" am:
69251fca46
am:
83a2bc6a3b -s ours
Change-Id: Idacefac9a3991453f635b3bd2af554bf96e4e821
Sundong Ahn [Fri, 12 Oct 2018 01:06:17 +0000 (18:06 -0700)]
Merge "Add the metalava_enabled property"
am:
69251fca46
Change-Id: I5720ce833d0ffd0016dc8a77cb0f56b0d34a9c21
Nan Zhang [Fri, 12 Oct 2018 00:54:36 +0000 (17:54 -0700)]
Fix the incorrect javadoc links
A lot of unresolved link errors showing up after go/ag/
5172152.
Test: m -j docs with -lerror enabled
Bug: b/
116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
Treehugger Robot [Fri, 12 Oct 2018 00:50:32 +0000 (00:50 +0000)]
Merge "Add the metalava_enabled property"
Ryan Mitchell [Tue, 9 Oct 2018 22:08:41 +0000 (15:08 -0700)]
Preserve compression of xml files in convert
Respect the compression the original compression of xml files when using
aapt2 convert. Uncompressed files should remain uncompressed, and
compressed files should remain compressed.
Bug:
117289326
Test: manual
Change-Id: I81b431b4a4abd81f5694ea7dc3b3c6ec8c13ca32
Sooraj Sasindran [Thu, 11 Oct 2018 23:45:44 +0000 (16:45 -0700)]
[automerger skipped] Merge "Introduce AlternativeNetwork APIs" am:
98966bcbb6 am:
10211c1f68
am:
e3630c858a -s ours
Change-Id: I2c6c1300a6a5ffec779ee1010f5bd96e260d6148
Nan Zhang [Thu, 11 Oct 2018 23:44:28 +0000 (16:44 -0700)]
Fix incorrect javadoc link
Test: m -j docs with -lerror enabled for frameworks/base docs.
Bug: b/
116163454
Change-Id: I02a164b676397dd2d9e8a52ae344c1033b1a4029
OSDN Git Service
