OSDN Git Service
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:23:39 +0000 (20:23 -0700)]
Merge "Separate NetworkMonitor/framework portal URL" am:
bcd3bed561 am:
34198fac89
am:
4d975feb9f
Change-Id: I85e744d94d96ecf9ac558e62016418d8199bb98c
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:11:49 +0000 (20:11 -0700)]
Merge "Separate NetworkMonitor/framework portal URL" am:
bcd3bed561
am:
34198fac89
Change-Id: Ic6c16ccf98e943b7003524f6e2b98e100e543221
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:10:38 +0000 (20:10 -0700)]
[automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am:
3c959339ae am:
79f2cf93d2
am:
cd08ecfdfd -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1
24ec3ff006 is in history
Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9
TreeHugger Robot [Mon, 25 Mar 2019 03:04:20 +0000 (03:04 +0000)]
Merge changes I14c90b6a,I7850a556
* changes:
Reset configuration of invisible size-compat activity if display changes
Don't involve decor inset into app bounds of fixed aspect ratio app
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:02:39 +0000 (20:02 -0700)]
Merge "Separate NetworkMonitor/framework portal URL"
am:
bcd3bed561
Change-Id: I1926527f7875e459b4d3c84bfcd8b3aac9562cae
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:57:01 +0000 (19:57 -0700)]
Merge "Fix API in CaptivePortal and ConnectivityManager" am:
3c959339ae
am:
79f2cf93d2
Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d
Chiachang Wang [Mon, 25 Mar 2019 02:54:29 +0000 (19:54 -0700)]
[automerger skipped] Merge "Add network stack proto" am:
727f8bbfc6 am:
2fa14ae4c0
am:
16dd607022 -s ours
am skip reason: change_id Iec48037771f2729fcbf741eb1c16edf08dbc70a4 with SHA1
0e88ebfb28 is in history
Change-Id: I46f43baf167e92ea8353d2fd17530909ee7f6c62
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:50:37 +0000 (02:50 +0000)]
Merge "Separate NetworkMonitor/framework portal URL"
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:46:32 +0000 (19:46 -0700)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
am:
3c959339ae
Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
Calvin Pan [Mon, 25 Mar 2019 02:41:19 +0000 (19:41 -0700)]
Merge "Marked nullable in setter argument" am:
f5bc344375 am:
2f0ad7bfd6
am:
20fff460f6
Change-Id: I189e229115a2106a7a9826f4109f0194d2b1f061
Treehugger Robot [Mon, 25 Mar 2019 02:37:28 +0000 (02:37 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
Chiachang Wang [Mon, 25 Mar 2019 02:36:45 +0000 (19:36 -0700)]
Merge "Add network stack proto" am:
727f8bbfc6
am:
2fa14ae4c0
Change-Id: Ia82ff368e705150015be6f9dad8c1f93fa9ec8c7
Calvin Pan [Mon, 25 Mar 2019 02:31:38 +0000 (19:31 -0700)]
Merge "Marked nullable in setter argument" am:
f5bc344375
am:
2f0ad7bfd6
Change-Id: I02525e27fd9b4da474ff15bf502c49626ba079d2
Chiachang Wang [Mon, 25 Mar 2019 02:26:32 +0000 (19:26 -0700)]
Merge "Add network stack proto"
am:
727f8bbfc6
Change-Id: Ic01456c0860e6435f26b1af48359096db6b63224
Calvin Pan [Mon, 25 Mar 2019 02:17:45 +0000 (19:17 -0700)]
Merge "Marked nullable in setter argument"
am:
f5bc344375
Change-Id: I6eb379b487e85e4523227938a1f1c281b6b1a8ce
Chiachang Wang [Mon, 25 Mar 2019 02:16:16 +0000 (02:16 +0000)]
Merge "Add network stack proto"
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:08:46 +0000 (19:08 -0700)]
Merge "Refactor DhcpErrorEvent error codes" am:
ed2e54a521 am:
150a395303
am:
78c80c1098
Change-Id: Icfc48ac2ac899a25836e142b5c22dae51fd1752f
Calvin Pan [Mon, 25 Mar 2019 02:01:52 +0000 (02:01 +0000)]
Merge "Marked nullable in setter argument"
Remi NGUYEN VAN [Mon, 25 Mar 2019 01:55:37 +0000 (18:55 -0700)]
Merge "Refactor DhcpErrorEvent error codes" am:
ed2e54a521
am:
150a395303
Change-Id: I6f18975173a21526b3fe8a9c174b16625e1fab0e
Remi NGUYEN VAN [Mon, 25 Mar 2019 01:46:13 +0000 (18:46 -0700)]
Merge "Refactor DhcpErrorEvent error codes"
am:
ed2e54a521
Change-Id: I5bbac5cedb73e1a7705914f190ff22f753791e96
Mark Renouf [Mon, 25 Mar 2019 01:44:48 +0000 (01:44 +0000)]
Merge "Adds StatusBarNotificationActivityStarterTest"
Remi NGUYEN VAN [Fri, 22 Mar 2019 02:14:13 +0000 (11:14 +0900)]
Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
added in Q timeframe and ends up being unnecessary since
CaptivePortal creation was refactored to ConnectivityService because
of visibility issues on ICaptivePortal.
- Rename getAvoidBadWifi to shouldAvoidBadWifi
- Add permission annotation for shouldAvoidBadWifi
(already merged in internal as:
I09545c00af3519dbf141dd5951b28f49e37b3e80)
Test: flashed, WiFi and captive portal works
Bug:
128935314
Bug:
128935673
Merged-In: I09545c00af3519dbf141dd5951b28f49e37b3e80
Change-Id: I7395d4a4db6a64398a827692aee1956c011873e5
Remi NGUYEN VAN [Mon, 25 Mar 2019 01:33:59 +0000 (01:33 +0000)]
Merge "Refactor DhcpErrorEvent error codes"
Jackal Guo [Mon, 25 Mar 2019 01:11:36 +0000 (01:11 +0000)]
Merge "Refine adjustIsVisibleToUser"
Jeff Sharkey [Sun, 24 Mar 2019 18:50:51 +0000 (12:50 -0600)]
Query specific collections for properties.
We're now enforcing the public API schema, so clients like MTP need
to query specific collections when asking for properties that are
specific to those media types.
Also refactor MediaScanner calls to go through MediaProvider, so
they can be handled by ModernMediaScanner. We no longer directly
try inserting items, and instead rely completely on the scanner.
Bug:
127625964,
122263824
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ic86982766606a619afafe725f9c60013a5671840
Jeff Sharkey [Sun, 24 Mar 2019 16:49:55 +0000 (16:49 +0000)]
Merge "More apps making assumptions about MediaStore."
Hai Shalom [Sun, 24 Mar 2019 16:46:58 +0000 (16:46 +0000)]
Merge "[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type"
Hyundo Moon [Sun, 24 Mar 2019 12:15:07 +0000 (12:15 +0000)]
Merge "Remove SessionCallbackLink"
TreeHugger Robot [Sun, 24 Mar 2019 11:03:27 +0000 (11:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sun, 24 Mar 2019 08:21:49 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1895204b3d43e1796c9fbf437f53b85db36b4549
Auto-generated-cl: translation import
Bill Yi [Sun, 24 Mar 2019 07:31:14 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia9353b95fd48812e2c50c1588649ef91f1c4f2c9
Auto-generated-cl: translation import
Joe Onorato [Sun, 24 Mar 2019 01:14:23 +0000 (01:14 +0000)]
Merge "Add bit --refresh which updates module-info.json"
Philip P. Moltmann [Sat, 23 Mar 2019 23:14:16 +0000 (23:14 +0000)]
Merge "Do not remove location permissions on Q-beta OTAs"
Joe Onorato [Sat, 23 Mar 2019 23:12:32 +0000 (16:12 -0700)]
Add bit --refresh which updates module-info.json
Change-Id: Iacd760442fa45d1e23ce249d51c45f2313d6467c
TreeHugger Robot [Sat, 23 Mar 2019 22:15:18 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Varun Shah [Sat, 23 Mar 2019 22:14:40 +0000 (22:14 +0000)]
Merge "Remove deprecated USM#registerAppUsageLimitObserver."
TreeHugger Robot [Sat, 23 Mar 2019 20:48:04 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 23 Mar 2019 20:02:24 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 23 Mar 2019 19:46:11 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 23 Mar 2019 19:45:01 +0000 (19:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Sat, 23 Mar 2019 19:31:56 +0000 (19:31 +0000)]
Merge "Helper methods for constructing MediaStore Uris."
Jeff Sharkey [Sat, 23 Mar 2019 18:51:57 +0000 (12:51 -0600)]
More apps making assumptions about MediaStore.
Bug:
128803870
Test: none
Change-Id: I2e7e9ce0feda3209495c5e6952672ae62bd638fc
TreeHugger Robot [Sat, 23 Mar 2019 18:13:23 +0000 (18:13 +0000)]
Merge "CleanSpec for DynamicAndroidInstallationService"
Jeff Sharkey [Sat, 23 Mar 2019 17:59:03 +0000 (17:59 +0000)]
Merge changes from topic "mar22z"
* changes:
Point people towards ModernMediaScanner.
Translate paths before leaving app sandbox.
Jeff Sharkey [Sat, 23 Mar 2019 17:54:43 +0000 (11:54 -0600)]
Helper methods for constructing MediaStore Uris.
Bug:
128787096
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I2848feb616df1c4df0b1bb71544769f61b9d84e8
Bill Yi [Sat, 23 Mar 2019 17:37:02 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63d39e6c8b2601ecfda7cc4ae0453ed13f6d7deb
Auto-generated-cl: translation import
Bill Yi [Sat, 23 Mar 2019 16:45:01 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf5e77fadd60d027ae475510d0705bb3bd6d3eb7
Auto-generated-cl: translation import
Po-Chien Hsueh [Sat, 23 Mar 2019 16:29:39 +0000 (00:29 +0800)]
CleanSpec for DynamicAndroidInstallationService
We renamed DynamicAndroidInstallationService, add it to CleanSpec.
Bug:
129159349
Test: Rename and make
Change-Id: I5445cafbbd5b0ae7af77fdf76ddc50ce6ad1e6de
Bill Yi [Sat, 23 Mar 2019 16:29:28 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d6599aba123b7e96f9099c84550e8fdbeabcb91
Auto-generated-cl: translation import
Bill Yi [Sat, 23 Mar 2019 16:28:17 +0000 (09:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb415cc9cf3f1f0f4750e783ef0af46cb2a3a018
Auto-generated-cl: translation import
Bill Yi [Sat, 23 Mar 2019 15:53:21 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65b814b71096682291ab6ffedfcc97f4949c9975
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 23 Mar 2019 09:55:19 +0000 (09:55 +0000)]
Merge "Fixed a property naming mismatch."
TreeHugger Robot [Sat, 23 Mar 2019 06:19:42 +0000 (06:19 +0000)]
Merge "Converting EXTRA_PACKAGE_NAME to a link tag"
TreeHugger Robot [Sat, 23 Mar 2019 06:00:18 +0000 (06:00 +0000)]
Merge "Api feedback for status bar icon api"
Jin Seok Park [Sat, 23 Mar 2019 05:44:56 +0000 (05:44 +0000)]
Merge "Move Session2Command result codes into Result class"
TreeHugger Robot [Sat, 23 Mar 2019 05:03:04 +0000 (05:03 +0000)]
Merge "Mainline logging to statsd: native static libs"
Tej Singh [Sat, 23 Mar 2019 05:00:52 +0000 (05:00 +0000)]
Merge "Public StatsLog API for generic mainline logging."
TreeHugger Robot [Sat, 23 Mar 2019 05:00:14 +0000 (05:00 +0000)]
Merge "Make Resources.Theme.rebase() public API"
TreeHugger Robot [Sat, 23 Mar 2019 04:33:21 +0000 (04:33 +0000)]
Merge "Added a "lite" flag on ContentCaptureOptions."
Jin Seok Park [Mon, 18 Mar 2019 13:37:18 +0000 (22:37 +0900)]
Move Session2Command result codes into Result class
Bug:
128459284
Test: update-api
Change-Id: I01167fb81724432462f78233d45abc9c3a8e641f
Kweku Adams [Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)]
Merge "Adding new strings for battery saver sticky off notification."
TreeHugger Robot [Sat, 23 Mar 2019 03:08:26 +0000 (03:08 +0000)]
Merge "Fill elapsedRealtime fields in GnssClock"
TreeHugger Robot [Sat, 23 Mar 2019 02:59:46 +0000 (02:59 +0000)]
Merge "Do not remove enumerate client immediately when user switches"
Winson Chung [Sat, 23 Mar 2019 02:41:41 +0000 (02:41 +0000)]
Merge "Fixing up some logic around excluded tasks"
TreeHugger Robot [Sat, 23 Mar 2019 02:34:25 +0000 (02:34 +0000)]
Merge "Restricts ContentCapture and AugmentedAutofill when using temporary services."
Hall Liu [Sat, 23 Mar 2019 02:13:33 +0000 (02:13 +0000)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
Cody Kesting [Sat, 23 Mar 2019 01:53:41 +0000 (18:53 -0700)]
Merge "Annotate Data and Voice Roaming setters with @TestApi." am:
e1dda15d6c am:
c028f7a57a
am:
66fb2bf986
Change-Id: Iba01930bc02239e54bd05ef4e98a99cdb74d4be4
Ilya Matyukhin [Sat, 23 Mar 2019 01:38:07 +0000 (01:38 +0000)]
Merge "Update strings for face auth"
Cody Kesting [Sat, 23 Mar 2019 01:36:14 +0000 (18:36 -0700)]
Merge "Annotate Data and Voice Roaming setters with @TestApi." am:
e1dda15d6c
am:
c028f7a57a
Change-Id: I4976be17b20e7ecc6466303179e53629f2252937
TreeHugger Robot [Sat, 23 Mar 2019 01:28:20 +0000 (01:28 +0000)]
Merge "Adding strings for user-initiated heap dumps."
Cody Kesting [Sat, 23 Mar 2019 01:22:15 +0000 (18:22 -0700)]
Merge "Annotate Data and Voice Roaming setters with @TestApi."
am:
e1dda15d6c
Change-Id: I450069925ec6b931d88c964aba4975167531d93d
TreeHugger Robot [Sat, 23 Mar 2019 01:18:00 +0000 (01:18 +0000)]
Merge "Code cleanup in ZygoteProcess.java."
Treehugger Robot [Sat, 23 Mar 2019 01:03:31 +0000 (01:03 +0000)]
Merge "Annotate Data and Voice Roaming setters with @TestApi."
TreeHugger Robot [Sat, 23 Mar 2019 00:52:07 +0000 (00:52 +0000)]
Merge "Do not allow registration of null callbacks"
Haoyu Zhang [Sat, 23 Mar 2019 00:51:01 +0000 (00:51 +0000)]
Merge "Fix comment of MeasuredText"
Chris Wailes [Sat, 23 Mar 2019 00:45:28 +0000 (17:45 -0700)]
Fixed a property naming mismatch.
Device configuration properties in ZygoteConfig.java used old names for
certain values. These name strings have been updated to the correct
values and additional logging has been added to help catch future
issues.
Test: m
Test: boot and check log for USAP messages
Change-Id: I2fb92afe7edd9b1254dd3be659ec5063aa0b8e16
Michael Wright [Sat, 23 Mar 2019 00:36:20 +0000 (17:36 -0700)]
Merge "Add self to OWNERS for MediaProjection." am:
00ccf23ebd am:
187bd825b8
am:
12683c7d9d
Change-Id: I716cf4f93ca453a69e054f3b455cc4ba62be8941
Michael Wright [Sat, 23 Mar 2019 00:26:57 +0000 (17:26 -0700)]
Merge "Add self to OWNERS for MediaProjection." am:
00ccf23ebd
am:
187bd825b8
Change-Id: Ic59abd88618d5b06dedf5f618a428f8ab1c4f022
TreeHugger Robot [Sat, 23 Mar 2019 00:26:47 +0000 (00:26 +0000)]
Merge "Restrict access to FLAG_USE_CHILD_DRAWING_ORDER."
TreeHugger Robot [Sat, 23 Mar 2019 00:26:27 +0000 (00:26 +0000)]
Merge "Oh Minute instead of O'Minute for 1-9 minutes after the hour."
TreeHugger Robot [Sat, 23 Mar 2019 00:25:37 +0000 (00:25 +0000)]
Merge "Prevent nav bar from laying out dimensions of previous orientation"
TreeHugger Robot [Sat, 23 Mar 2019 00:23:27 +0000 (00:23 +0000)]
Merge "Update the ripple color for the dialog buttons."
TreeHugger Robot [Sat, 23 Mar 2019 00:21:07 +0000 (00:21 +0000)]
Merge "Let single tap devices wake up with double tap"
Michael Wright [Sat, 23 Mar 2019 00:14:39 +0000 (17:14 -0700)]
Merge "Add self to OWNERS for MediaProjection."
am:
00ccf23ebd
Change-Id: I34369b2d81c8fea7c56000e305ee8f82a18135de
Kevin Chyn [Fri, 22 Mar 2019 22:52:08 +0000 (15:52 -0700)]
Do not remove enumerate client immediately when user switches
The client should not be removed until ERROR_CANCEL is removed in the
system service, since that's the HIDL contract. Pending clients will start
after, automatically with the current logic.
Test: With fingerprint enrolled on multiple users, switch rapidly
system service does not crash
Fixes:
128346522
Change-Id: I6907d8f76373c012ddffd2b98a81d70e79ac72ab
Kweku Adams [Thu, 21 Mar 2019 20:06:53 +0000 (13:06 -0700)]
Adding new strings for battery saver sticky off notification.
Bug:
112232746
Bug:
128928252
Test: manual
Change-Id: I70e3d8e4a80b204eb5154a2d14de8b6ad7f46785
TreeHugger Robot [Fri, 22 Mar 2019 23:48:52 +0000 (23:48 +0000)]
Merge "Added NonNull categoryIds for fc shell cmd."
Treehugger Robot [Fri, 22 Mar 2019 23:48:31 +0000 (23:48 +0000)]
Merge "Add self to OWNERS for MediaProjection."
TreeHugger Robot [Fri, 22 Mar 2019 23:36:21 +0000 (23:36 +0000)]
Merge "Conversation Actions: support multiple models."
Evan Severson [Fri, 22 Mar 2019 23:35:46 +0000 (23:35 +0000)]
Merge "Change subtext for MEDIA_VISUAL"
Ecco Park [Fri, 22 Mar 2019 23:33:59 +0000 (23:33 +0000)]
Merge "Define allow_metered_network_for_cert_download_bool flag"
Jeff Sharkey [Fri, 22 Mar 2019 23:30:46 +0000 (17:30 -0600)]
Point people towards ModernMediaScanner.
The platform media scanner has served faithfully for many years, but
it's become tedious to test and maintain, mainly due to the way it
weaves obscurely between managed and native code.
Bug:
128243527
Test: none
Change-Id: I44c5e9840acc0afde4aeaf9a44a21e0f8939b44b
Haoyu Zhang [Fri, 22 Mar 2019 23:01:25 +0000 (16:01 -0700)]
Fix comment of MeasuredText
Bug: N/A
Test: make offline-sdk-docs
Change-Id: If60cbf4ed05ec07ac0be24689ee01d0763ba9b31
Felipe Leme [Fri, 22 Mar 2019 21:27:44 +0000 (14:27 -0700)]
Restricts ContentCapture and AugmentedAutofill when using temporary services.
Test: manual verification
Test: atest CtsContentCaptureServiceTestCases AugmentedLoginActivityTest
Fixes:
120514763
Change-Id: Icb4bfab566ecb041ff77655651b1f6c51551303f
TreeHugger Robot [Fri, 22 Mar 2019 23:23:21 +0000 (23:23 +0000)]
Merge "RTT LCI API *MINOR UPDATE2* (Client Side) - removing two LCI methods Based on discussion with IEEE 802.11 WG these are not necessary for RTT."
Jeff Sharkey [Fri, 22 Mar 2019 23:18:38 +0000 (17:18 -0600)]
Translate paths before leaving app sandbox.
When sending the ACTION_MEDIA_SCANNER_SCAN_FILE broadcast, an app
provides a raw filesystem path, which might be inside of their
sandbox.
Once the broadcast is delivered, we don't know where it came from,
so we need to translate the path before leaving the app process.
Bug:
117909601
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ibddd72a2d85e1f6541e0d6209e539fe6b5c4bde0
Chris Wailes [Wed, 13 Mar 2019 23:42:09 +0000 (16:42 -0700)]
Code cleanup in ZygoteProcess.java.
Generic code cleanup. Changed access scopes, replaced code with utility
functions, and outlined some code.
Test: m
Test: treehugger
Change-Id: I6d9a827abf88dc30eac611642723d69cb75bb351
TreeHugger Robot [Fri, 22 Mar 2019 23:00:01 +0000 (23:00 +0000)]
Merge "Fixed Content Capture workflow when service package is updated."
TreeHugger Robot [Fri, 22 Mar 2019 22:59:19 +0000 (22:59 +0000)]
Merge "Add status for license starting in the future"
TreeHugger Robot [Fri, 22 Mar 2019 22:56:06 +0000 (22:56 +0000)]
Merge "Add new constants for dark mode screen"