OSDN Git Service
TreeHugger Robot [Tue, 2 Apr 2019 01:17:46 +0000 (01:17 +0000)]
Merge "Add INSTALL_STAGED_CANCEL_* enums"
Chalard Jean [Tue, 2 Apr 2019 01:13:24 +0000 (18:13 -0700)]
Merge "Cleanup SystemReady in the network stack" am:
e0ef7ce4f7 am:
4b130e8567
am:
aafb4b0576
Change-Id: I0e57236ede9dd176cd30ea034d05205776662c91
Hall Liu [Tue, 2 Apr 2019 00:57:09 +0000 (17:57 -0700)]
[automerger skipped] Merge "Add a new carrier config to show the WFC location privacy policy UI" am:
4c508d1b03 am:
d94791b712
am:
516b07ee2c -s ours
am skip reason: change_id I58df76ae97b54009b55a7a78fcaec95cd9b27ca6 with SHA1
7f3a9d08c6 is in history
Change-Id: If02ed9c640ad95115d27579f5357ff540caf4341
Chiachang Wang [Tue, 2 Apr 2019 00:51:51 +0000 (00:51 +0000)]
Merge "Link to android experimental flags API"
TreeHugger Robot [Tue, 2 Apr 2019 00:42:42 +0000 (00:42 +0000)]
Merge "Adds @NonNull to getChildSessionIds"
Chalard Jean [Tue, 2 Apr 2019 00:41:35 +0000 (17:41 -0700)]
Merge "Cleanup SystemReady in the network stack" am:
e0ef7ce4f7
am:
4b130e8567
Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be
Jack He [Tue, 2 Apr 2019 00:40:49 +0000 (17:40 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors" am:
463454432b am:
39a6d731bb
am:
f08eadc878
Change-Id: I042170e4b06ee298c063a84c8f7aaabe58a4c0dd
Mathieu Chartier [Tue, 2 Apr 2019 00:32:46 +0000 (17:32 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am:
72e80b5b1a am:
efeaad3225
am:
e58f122e19
Change-Id: I40fc2836471279635acc26c06aa4a18a183947f9
TreeHugger Robot [Tue, 2 Apr 2019 00:29:32 +0000 (00:29 +0000)]
Merge "Replace bubble header with adaptive settings icon"
Hall Liu [Tue, 2 Apr 2019 00:24:01 +0000 (17:24 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI" am:
4c508d1b03
am:
d94791b712
Change-Id: I435a8b653960e07931bb8c0c11fad3f805431dc6
Jack He [Tue, 2 Apr 2019 00:18:16 +0000 (17:18 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors" am:
463454432b
am:
39a6d731bb
Change-Id: If1410685d139f44a87648bfdb87094cd30ec8462
TreeHugger Robot [Tue, 2 Apr 2019 00:13:19 +0000 (00:13 +0000)]
Merge "AAPT2: Delete dead code"
Chalard Jean [Tue, 2 Apr 2019 00:12:06 +0000 (17:12 -0700)]
Merge "Cleanup SystemReady in the network stack"
am:
e0ef7ce4f7
Change-Id: I1a55078b74d5f94afde94da0dc5f6e1d2af10de3
Mathieu Chartier [Tue, 2 Apr 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am:
72e80b5b1a
am:
efeaad3225
Change-Id: I16ff57136a2f53e97b494c866ac3497e00996823
Remi NGUYEN VAN [Tue, 2 Apr 2019 00:10:19 +0000 (00:10 +0000)]
Merge "Rename NetworkStackPermissionStub"
Philip P. Moltmann [Mon, 1 Apr 2019 23:45:23 +0000 (23:45 +0000)]
Merge "Remove dual storage permission model"
Hall Liu [Mon, 1 Apr 2019 23:34:30 +0000 (16:34 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
am:
4c508d1b03
Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6
Philip P. Moltmann [Wed, 27 Mar 2019 19:24:45 +0000 (12:24 -0700)]
Remove dual storage permission model
- Also remove typed media permissions
- Leave typed media app-ops
Bug:
129716569
Test: Used apps, looked at permissions in the UI
Change-Id: If7714fb1a6955584157e1a60ab72b09e35287827
Jack He [Mon, 1 Apr 2019 23:29:30 +0000 (16:29 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors"
am:
463454432b
Change-Id: I51d7f625dd2bcb81fec4bcf25822d1533cbc5cee
Chalard Jean [Mon, 1 Apr 2019 23:28:47 +0000 (23:28 +0000)]
Merge "Cleanup SystemReady in the network stack"
Jaewoong Jung [Mon, 1 Apr 2019 23:24:43 +0000 (16:24 -0700)]
[automerger skipped] Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
am:
6a9a4a375b -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
9a7e79112d is in history
Change-Id: I39ac5cf2246711f23582dac5a20974acb9909254
Mathieu Chartier [Mon, 1 Apr 2019 23:24:14 +0000 (16:24 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
am:
72e80b5b1a
Change-Id: Iaf05e6a285dbf626854a3b37101bea032af3a7a8
TreeHugger Robot [Mon, 1 Apr 2019 23:16:07 +0000 (23:16 +0000)]
Merge "Increase logging level in GnssSatelliteBlacklistHelper"
Jaewoong Jung [Mon, 1 Apr 2019 23:13:09 +0000 (16:13 -0700)]
[automerger skipped] Revert "Convert Android.mk to Android.bp"
am:
cf2dcbaeeb -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
9a7e79112d is in history
Change-Id: Ib86de327bf5d87717fac4c0d10a0ae0da7899f70
Ahmed ElArabawy [Mon, 1 Apr 2019 22:57:54 +0000 (22:57 +0000)]
Merge "wifi.proto: Add WifiLock statistics"
Hall Liu [Mon, 1 Apr 2019 22:55:51 +0000 (22:55 +0000)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
Badhri Jagan Sridharan [Mon, 1 Apr 2019 22:54:39 +0000 (22:54 +0000)]
Merge "Only re-enable contaminant detection when port is present"
Jaewoong Jung [Mon, 1 Apr 2019 22:54:33 +0000 (22:54 +0000)]
Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
Jaewoong Jung [Mon, 1 Apr 2019 22:43:03 +0000 (22:43 +0000)]
Revert "Convert Android.mk to Android.bp"
This reverts commit
9a7e79112d5d936ace862e565b7df724906ae1de.
Reason for revert: Broke builds
Change-Id: I45b2e49535a12272963a24f1e9f7ef25b31e5360
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
TreeHugger Robot [Mon, 1 Apr 2019 22:41:44 +0000 (22:41 +0000)]
Merge "Fine tune app entites measurement"
Treehugger Robot [Mon, 1 Apr 2019 22:37:43 +0000 (22:37 +0000)]
Merge "BluetoothHealth: hide auto-created default constructors"
Android Build Merger (Role) [Mon, 1 Apr 2019 22:33:05 +0000 (22:33 +0000)]
Merge "[automerger skipped] Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp am:
306ab7ee28 -s ours am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
edfa8e90a1 is in history"
Jaewoong Jung [Mon, 1 Apr 2019 22:31:59 +0000 (15:31 -0700)]
[automerger skipped] Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp
am:
306ab7ee28 -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
edfa8e90a1 is in history
Change-Id: Ic66dd5cad21c20db0b4e9fee747322c73080839c
TreeHugger Robot [Mon, 1 Apr 2019 22:30:43 +0000 (22:30 +0000)]
Merge "Move TextClassifierPerfTest to a separate package"
TreeHugger Robot [Mon, 1 Apr 2019 22:30:12 +0000 (22:30 +0000)]
Merge "Removing API to access app usage as it is no long public"
Svetoslav Ganov [Mon, 1 Apr 2019 22:30:03 +0000 (22:30 +0000)]
Merge "Add missing argument and return annotations"
Mathieu Chartier [Mon, 1 Apr 2019 22:29:07 +0000 (22:29 +0000)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
Svetoslav Ganov [Mon, 1 Apr 2019 22:12:35 +0000 (22:12 +0000)]
Merge "Add missing nullability annotations"
TreeHugger Robot [Mon, 1 Apr 2019 22:09:19 +0000 (22:09 +0000)]
Merge "Update javadoc on BatterySaverPolicyConfig"
TreeHugger Robot [Mon, 1 Apr 2019 22:07:07 +0000 (22:07 +0000)]
Merge "Add a "More" item for the new default apps list."
Jaewoong Jung [Mon, 1 Apr 2019 22:01:26 +0000 (22:01 +0000)]
Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp
TreeHugger Robot [Mon, 1 Apr 2019 21:57:57 +0000 (21:57 +0000)]
Merge "Enable presubmit for idmap2_tests"
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:47:40 +0000 (14:47 -0700)]
[automerger skipped] Merge "Remove clearDefaultsForInactiveSubIds." am:
1e263e7bc0 am:
4e32ac7754
am:
65d4295c3c -s ours
am skip reason: change_id Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9 with SHA1
c4c05b6d92 is in history
Change-Id: Idc2aa9fe31c0a9d03505bcd9f62af4344066d35d
Lyn Han [Fri, 29 Mar 2019 23:46:07 +0000 (16:46 -0700)]
Replace bubble header with adaptive settings icon
Bug:
128010178
Test: manual
Change-Id: Ia0a0f72d7ed1da3fd7dbdcff235cf0bcb39100c4
Android Build Merger (Role) [Mon, 1 Apr 2019 21:37:56 +0000 (21:37 +0000)]
Merge changes from topic "am-
002ad919bad249f3b11d8215de81b6c6"
* changes:
[automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215 am:
7e3864bc99 am:
e53008bed5 -s ours am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1
9cf3e7ae68 is in history
Allow requestNetworkScan to return sanitized info am:
c9d7430685 am:
87217889f1 am:
9e1d425b58
Hall Liu [Mon, 1 Apr 2019 21:35:46 +0000 (14:35 -0700)]
[automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215 am:
7e3864bc99
am:
e53008bed5 -s ours
am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1
9cf3e7ae68 is in history
Change-Id: I0e7d646a5f4f5522df471df5ec921e63fff81a38
TreeHugger Robot [Mon, 1 Apr 2019 21:34:26 +0000 (21:34 +0000)]
Merge "Update icon packs."
TreeHugger Robot [Mon, 1 Apr 2019 21:31:15 +0000 (21:31 +0000)]
Merge "Revert "Revert "Checkng upper bound in *Array classes."""
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:31:06 +0000 (14:31 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds." am:
1e263e7bc0
am:
4e32ac7754
Change-Id: I8c21ba73807837f999bf3fcc7fbef1d24c7500da
Hall Liu [Mon, 1 Apr 2019 21:29:04 +0000 (14:29 -0700)]
Allow requestNetworkScan to return sanitized info am:
c9d7430685 am:
87217889f1
am:
9e1d425b58
Change-Id: I3fab8c08100a68aba55eefb27b587e73849bc108
Evan Severson [Mon, 1 Apr 2019 21:28:58 +0000 (21:28 +0000)]
Merge "Extract resources for BarChartPreference"
Patrick Baumann [Mon, 1 Apr 2019 21:10:07 +0000 (14:10 -0700)]
Adds @NonNull to getChildSessionIds
Addresses API council feedback to appropriately annotate
SessionInfo.getChildSessionIds.
Test: None
Bug:
126699287
Change-Id: Iaebc4f2db07b359cef0aff863e517c221259b47c
Hall Liu [Mon, 1 Apr 2019 21:14:03 +0000 (14:14 -0700)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215
am:
7e3864bc99
Change-Id: I45112b415f0f1d6a991b65a2f87c04f829a13548
Hall Liu [Mon, 1 Apr 2019 21:08:39 +0000 (14:08 -0700)]
Allow requestNetworkScan to return sanitized info am:
c9d7430685
am:
87217889f1
Change-Id: I601304e6eaedef27a2adc413084e6a240a5e9b97
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:05:57 +0000 (14:05 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds."
am:
1e263e7bc0
Change-Id: I8fb91dd4928cf8a607a876cc304c261bfb762a59
Hall Liu [Mon, 1 Apr 2019 20:54:15 +0000 (13:54 -0700)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
am:
f276a56215
Change-Id: I1399e0bd8a6ff26e8df2bfc7d4515e4dbb1d64e4
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 20:51:54 +0000 (20:51 +0000)]
Merge "Remove clearDefaultsForInactiveSubIds."
Hall Liu [Mon, 1 Apr 2019 20:47:42 +0000 (13:47 -0700)]
Allow requestNetworkScan to return sanitized info
am:
c9d7430685
Change-Id: I91b315cd48095345f34755cc13d059158982a960
Hall Liu [Mon, 1 Apr 2019 20:31:10 +0000 (20:31 +0000)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
* changes:
Add shell permissions for CTS testing
Allow requestNetworkScan to return sanitized info
Jack He [Fri, 29 Mar 2019 00:42:26 +0000 (17:42 -0700)]
BluetoothHealth: hide auto-created default constructors
Fixes:
123926561
Test: make
Change-Id: I388472c82eaca245285b5ecf2959c415508d7e69
Shuo Qian [Mon, 1 Apr 2019 20:16:22 +0000 (20:16 +0000)]
Merge "Clean up Call redirection setting"
Tony Mak [Mon, 1 Apr 2019 19:51:37 +0000 (20:51 +0100)]
Move TextClassifierPerfTest to a separate package
So, other tests in other package no longer affect us.
Currently, TextClassifierPerfTest is not run continuously because of
failures in other packages.
BUG:
129695635
Test: Run run.sh
Change-Id: I2253360d98404608193b53c8b34611c2ff1b231e
Jaewoong Jung [Wed, 27 Mar 2019 23:54:43 +0000 (16:54 -0700)]
Convert Android.mk to Android.bp
Bug:
122332340
Test: full build & flash on a Pixel + manual inspection + TreeHugger
Change-Id: I80688006411dcf32f8f329556044d25ad12af1ac
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
(cherry picked from commit
edfa8e90a1231df98be89994bc9d43458d96b79a)
John Reck [Mon, 1 Apr 2019 20:11:16 +0000 (20:11 +0000)]
Merge "Disable checkThread temporarily"
Paul Mclean [Mon, 1 Apr 2019 20:08:20 +0000 (20:08 +0000)]
Merge "Changing USB Headphone insert intent to be sent to ONLY current user."
Roshan Pius [Mon, 1 Apr 2019 19:57:11 +0000 (19:57 +0000)]
Merge "AndroidManifest.xml: Add new network permission for carrier provisioning"
Makoto Onuki [Mon, 1 Apr 2019 19:56:27 +0000 (12:56 -0700)]
Update javadoc on BatterySaverPolicyConfig
Change-Id: I21a536a603174ee859b49689f4a16184adab6813
Fix:
129473934
Test: Treehugger
TreeHugger Robot [Mon, 1 Apr 2019 19:44:21 +0000 (19:44 +0000)]
Merge "Expanding heap dump warning."
Michael Groover [Mon, 1 Apr 2019 19:27:42 +0000 (19:27 +0000)]
Merge "Remove unused code and cleanup parameters for DPM dev ID access"
Jorim Jaggi [Mon, 1 Apr 2019 19:21:34 +0000 (19:21 +0000)]
Merge "Immediately start drawing when becoming visible"
Badhri Jagan Sridharan [Mon, 1 Apr 2019 19:12:13 +0000 (12:12 -0700)]
Only re-enable contaminant detection when port is present
Contaminant detection is re-enabled when the disconnected port's
portStatus has contaminant detection disabled. During port removal,
there is no reason why contamiant detection has to re-enabled since
the port is anyways being teared down.
Bug:
129696344
Test: dumpsys usb add-port "matrix" ufp;
dumpsys usb remove-port "matrix" ufp
Change-Id: Ie146db82d93414e90ee99b4d17ec0ba5ada2ce83
Jorim Jaggi [Mon, 1 Apr 2019 19:13:55 +0000 (19:13 +0000)]
Merge "Also log when mayWait=false"
John Reck [Mon, 1 Apr 2019 18:53:04 +0000 (11:53 -0700)]
Disable checkThread temporarily
Bug:
129679214
Test: none
Change-Id: I58aa7110ee2ed18e7258e4c044ebe2a6e670aa8c
Mark Renouf [Mon, 1 Apr 2019 18:48:51 +0000 (18:48 +0000)]
Merge "When a Bubble notification is clicked, show the bubble"
Xi Han [Mon, 1 Apr 2019 18:37:58 +0000 (18:37 +0000)]
Merge "Add the NonNull annotation to avoid runtime exception when the engine is not bound successfully."
Mady Mellor [Mon, 1 Apr 2019 18:36:48 +0000 (18:36 +0000)]
Merge "Actually fix notification listeners dismissing bubbles"
TreeHugger Robot [Mon, 1 Apr 2019 18:23:27 +0000 (18:23 +0000)]
Merge "Remove hidden IntDef in java doc."
Salvador Martinez [Mon, 1 Apr 2019 18:22:06 +0000 (18:22 +0000)]
Merge "Switch keyboard shortcuts helper to daynight theme"
TreeHugger Robot [Mon, 1 Apr 2019 18:04:52 +0000 (18:04 +0000)]
Merge "Gesture Exclusion: Fix crash when exclusion updates after detaching window"
Mihai Niță [Mon, 1 Apr 2019 18:04:15 +0000 (18:04 +0000)]
Merge "Fix aapt2 pseudo-translating donottranslate* files"
Mathieu Chartier [Fri, 29 Mar 2019 20:49:35 +0000 (13:49 -0700)]
Pass debug.allocTracker.stackDepth to runtime if it exists
Since this is no longer called in ART, pass it down in bind application.
Bug:
37291459
Test: test-art-host
Change-Id: I23623e9b8e9ca6261d90cc1ae1c5d8c24cc4eba5
Quang Luong [Mon, 1 Apr 2019 17:55:36 +0000 (17:55 +0000)]
Merge "Connect to Passpoint network immediately after OSU provisioning"
Chavi Weingarten [Mon, 1 Apr 2019 17:53:00 +0000 (17:53 +0000)]
Merge "Add onPointerDownOutsideFocus for events outside the focused window (3/4)"
TreeHugger Robot [Mon, 1 Apr 2019 17:32:35 +0000 (17:32 +0000)]
Merge "Don't load EGL driver always"
Neil Fuller [Mon, 1 Apr 2019 17:13:45 +0000 (10:13 -0700)]
Merge "Track public android.system API changes in libcore" am:
1423684d1a am:
0036c64764
am:
f06759e799
Change-Id: I3b20374c1a2222fbb82796be30141b1854abda2c
Paul McLean [Mon, 18 Mar 2019 20:36:32 +0000 (14:36 -0600)]
Changing USB Headphone insert intent to be sent to ONLY current user.
Bug:
73364631
Test: Acct 1, insert headset, autostart. Switch to Acct 2, insert
headset, no auto start.
Change-Id: I50f0c6dbdb217a2e3b2f0b210df163fbc8f49039
Yao Chen [Mon, 1 Apr 2019 17:04:55 +0000 (17:04 +0000)]
Merge "Add the restricted_image incident report section, and some sample code in FaceService."
Philip Quinn [Tue, 29 Jan 2019 20:47:09 +0000 (12:47 -0800)]
Write touch classification metrics.
Bug:
111480215
Bug:
123663806
Test: statsd_testdrive 177
Change-Id: I44f0a1877acc38b3199dcc6a3b6d4bf00ac8d817
TreeHugger Robot [Mon, 1 Apr 2019 17:00:39 +0000 (17:00 +0000)]
Merge "Camera: Pass physical camera device id during errors"
Neil Fuller [Mon, 1 Apr 2019 16:59:59 +0000 (09:59 -0700)]
Merge "Track public android.system API changes in libcore" am:
1423684d1a
am:
0036c64764
Change-Id: I93b2d6742193414b3f6a81cd35e923a4f6b7f2fb
Neil Fuller [Mon, 1 Apr 2019 16:50:56 +0000 (09:50 -0700)]
Merge "Track public android.system API changes in libcore"
am:
1423684d1a
Change-Id: I98319e08a913b8c679579fb52bc4ded61fc5f5b0
TreeHugger Robot [Mon, 1 Apr 2019 16:49:26 +0000 (16:49 +0000)]
Merge "Invalidate Skia shader cache if Vulkan driver has changed"
TreeHugger Robot [Mon, 1 Apr 2019 16:44:26 +0000 (16:44 +0000)]
Merge "Remove support for the WebView stub."
Zimuzo Ezeozue [Mon, 1 Apr 2019 16:41:57 +0000 (16:41 +0000)]
Merge changes from topic "explicit"
* changes:
Notify PacakgeWatchdog when apps are ready
Add explicit health check to PackageWatchdog
Neil Fuller [Mon, 1 Apr 2019 16:41:11 +0000 (16:41 +0000)]
Merge "Track public android.system API changes in libcore"
TreeHugger Robot [Mon, 1 Apr 2019 16:28:54 +0000 (16:28 +0000)]
Merge "Restrict access to private flags."
Cassie [Mon, 1 Apr 2019 16:12:53 +0000 (09:12 -0700)]
Add the NonNull annotation to avoid runtime exception when the engine
is not bound successfully.
Bug:
124627359
Test: manual
Change-Id: I1b449ec6ec1c0164cc1b779ff573a2f84e521552
TreeHugger Robot [Mon, 1 Apr 2019 16:26:32 +0000 (16:26 +0000)]
Merge "Relaxed nullability requirements for setTintMode APIs for both PorterDuff.Mode and BlendMode"
TreeHugger Robot [Mon, 1 Apr 2019 16:26:22 +0000 (16:26 +0000)]
Merge "Separate insets from drawable for camera icon."
TreeHugger Robot [Mon, 1 Apr 2019 16:23:22 +0000 (16:23 +0000)]
Merge "WindowInsets: populate system gesture and tappable element insets"