OSDN Git Service
Ashley Rose [Fri, 1 Mar 2019 18:37:48 +0000 (18:37 +0000)]
Merge "Add nullability annotations to ColorStateListDrawable"
Yabin Cui [Fri, 1 Mar 2019 18:33:11 +0000 (18:33 +0000)]
Merge "Check if idmap2 is accessible before executing it."
TreeHugger Robot [Fri, 1 Mar 2019 18:29:48 +0000 (18:29 +0000)]
Merge "[OWE] Rename isOweSupported to isEnhancedOpenSupported"
Android Build Merger (Role) [Fri, 1 Mar 2019 18:26:40 +0000 (18:26 +0000)]
Merge "[automerger skipped] Merge "Add euicc privileged actions and extras." am:
9886350a69 am:
292d7a3692 am:
97d67dff39 -s ours am skip reason: change_id Ifcf6575c3c65cb38e8787e32bc04b0e4532f7170 with SHA1
f43a0ccf9a is in history"
Patrick Huang [Fri, 1 Mar 2019 18:25:36 +0000 (10:25 -0800)]
[automerger skipped] Merge "Add euicc privileged actions and extras." am:
9886350a69 am:
292d7a3692
am:
97d67dff39 -s ours
am skip reason: change_id Ifcf6575c3c65cb38e8787e32bc04b0e4532f7170 with SHA1
f43a0ccf9a is in history
Change-Id: I58866926e399cb935948657dc1305fdb5744e52a
TreeHugger Robot [Fri, 1 Mar 2019 18:23:42 +0000 (18:23 +0000)]
Merge changes from topic "staged_userdata_restore"
* changes:
Followup cleanup after refactoring rollback states.
Use a single list for available and committed rollbacks.
TreeHugger Robot [Fri, 1 Mar 2019 18:23:42 +0000 (18:23 +0000)]
Merge "Test for userdata restore in staged rollback test."
TreeHugger Robot [Fri, 1 Mar 2019 18:23:06 +0000 (18:23 +0000)]
Merge "Mark role related APIs as test API."
TreeHugger Robot [Fri, 1 Mar 2019 18:21:35 +0000 (18:21 +0000)]
Merge "Start running CtsGraphicsTestCases for changes to graphics code."
Brad Ebinger [Fri, 1 Mar 2019 18:09:55 +0000 (10:09 -0800)]
[automerger skipped] Merge "Fix ImsMmTelManager API in accordance with the council" am:
ea5bb6cd3b am:
5e7bfe1147
am:
92262ec974 -s ours
am skip reason: change_id I5d011e1875c082a4532747e30e8582ff3da4ee93 with SHA1
4b292c85b6 is in history
Change-Id: If926d944faecd5110264f92bf5aae896a78d5b53
Patrick Huang [Fri, 1 Mar 2019 18:04:05 +0000 (10:04 -0800)]
Merge "Add euicc privileged actions and extras." am:
9886350a69
am:
292d7a3692
Change-Id: I813de31e3a086d05d0a9ec29bbccc70df5a76497
Android Build Merger (Role) [Fri, 1 Mar 2019 17:58:01 +0000 (17:58 +0000)]
Merge "Merge "Make Uri.toSafeString() also handle 'rtsp'" am:
948d11ffa6 am:
a4fadcc192 am:
524cbefb5c"
Dongwon Kang [Fri, 1 Mar 2019 17:56:56 +0000 (09:56 -0800)]
Merge "Make Uri.toSafeString() also handle 'rtsp'" am:
948d11ffa6 am:
a4fadcc192
am:
524cbefb5c
Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71
Brad Ebinger [Fri, 1 Mar 2019 17:55:56 +0000 (09:55 -0800)]
Merge "Fix ImsMmTelManager API in accordance with the council" am:
ea5bb6cd3b
am:
5e7bfe1147
Change-Id: Ib71efd9afc25f0dbdd9547137c1d66d26e86b181
Fabian Kozynski [Fri, 1 Mar 2019 17:53:43 +0000 (17:53 +0000)]
Merge "Refactor CarrierTextController"
Patrick Huang [Fri, 1 Mar 2019 17:48:03 +0000 (09:48 -0800)]
Merge "Add euicc privileged actions and extras."
am:
9886350a69
Change-Id: I62dd31e083b229ad893208b88e4f91147c667974
Dongwon Kang [Fri, 1 Mar 2019 17:42:25 +0000 (09:42 -0800)]
Merge "Make Uri.toSafeString() also handle 'rtsp'" am:
948d11ffa6
am:
a4fadcc192
Change-Id: I5b8a8c6eddcbb8418494909757fe9b55d27acd01
Treehugger Robot [Fri, 1 Mar 2019 17:39:49 +0000 (17:39 +0000)]
Merge "Add euicc privileged actions and extras."
Brad Ebinger [Fri, 1 Mar 2019 17:37:40 +0000 (09:37 -0800)]
Merge "Fix ImsMmTelManager API in accordance with the council"
am:
ea5bb6cd3b
Change-Id: Iddb4c85b71d8fd17fda049e6137eec7a91f18413
Dongwon Kang [Fri, 1 Mar 2019 17:28:43 +0000 (09:28 -0800)]
Merge "Make Uri.toSafeString() also handle 'rtsp'"
am:
948d11ffa6
Change-Id: I3f77108d5b739ed5039e95576db44d94f20ad53e
Brad Ebinger [Fri, 1 Mar 2019 17:21:17 +0000 (17:21 +0000)]
Merge "Fix ImsMmTelManager API in accordance with the council"
Dongwon Kang [Fri, 1 Mar 2019 17:10:08 +0000 (17:10 +0000)]
Merge "Use Uri.toSafeString() in MediaPlayer[2].java."
Roshan Pius [Fri, 1 Mar 2019 17:09:31 +0000 (17:09 +0000)]
Merge "WifiNetworkSpecifier/Suggestion Builder: Add @NonNull annotations"
Dongwon Kang [Fri, 1 Mar 2019 17:09:29 +0000 (17:09 +0000)]
Merge "Make Uri.toSafeString() also handle 'rtsp'"
Brett Chabot [Fri, 1 Mar 2019 16:54:31 +0000 (16:54 +0000)]
Merge "Migrate frameworks/base/tests/testables and its users to androidx.test"
Brett Chabot [Wed, 27 Feb 2019 23:37:59 +0000 (15:37 -0800)]
Migrate frameworks/base/tests/testables and its users to androidx.test
See go/jetpack-test-android-migration
This is the internal version of AOSP change aosp/908373
Test: m -j TestablesTests NetworkStackTests FrameworksServicesTests SystemUITests FrameworksUiServicesTests ExtServicesUnitTests WmTests FrameworksCoreTests
Exempt-From-Owner-Approval: automated package name refactoring; already reviewed on AOSP
Change-Id: Ib04d80954bd8536914d88c66b28e6632e60a6245
Richard Uhler [Fri, 1 Mar 2019 16:03:01 +0000 (16:03 +0000)]
Followup cleanup after refactoring rollback states.
This CL addresses some minor comments as followup to the previous CL
"Use a single list for available and committed rollbacks".
Test: atest RollbackTest
Test: atest StagedRollbackTest
Test: atest AppDataRollbackHelperTest
Bug:
124044231
Change-Id: I6146cfac3a70017dc8d7eed6b6d3c19de932f14b
Matt Pape [Fri, 1 Mar 2019 15:30:08 +0000 (15:30 +0000)]
Merge "Add defaultValue to javadocs for typed getters."
Android Build Merger (Role) [Fri, 1 Mar 2019 15:18:02 +0000 (15:18 +0000)]
Merge "Merge "Support dexopting shared libraries." am:
3275a6b245 am:
2e07ca0f15 am:
adcb9fd8c8"
Nicolas Geoffray [Fri, 1 Mar 2019 15:16:31 +0000 (07:16 -0800)]
Merge "Support dexopting shared libraries." am:
3275a6b245 am:
2e07ca0f15
am:
adcb9fd8c8
Change-Id: I419d04436685772e187c87292a8143910e56ceaf
Roshan Pius [Thu, 28 Feb 2019 19:04:00 +0000 (11:04 -0800)]
wifi.proto: Fix a bug in the proto for API
Bug:
123362619
Bug:
123362779
Test: Compiles
Change-Id: I021ef2e93bd8547d7c135868b87861c72c808df7
Roshan Pius [Tue, 26 Feb 2019 23:00:22 +0000 (15:00 -0800)]
WifiNetworkSpecifier/Suggestion Builder: Add @NonNull annotations
Based on feedback from API council.
Bug:
123313291
Bug:
126699563
Bug:
126701114
Test: Compiles
Change-Id: I119649add8ec71b041631357994aa20c253a5568
Paul Duffin [Fri, 1 Mar 2019 15:08:14 +0000 (07:08 -0800)]
Merge "Switch android.test and junit classes to use UnsupportedAppUsage" am:
7bb0bcd305 am:
b5ccf0e21c
am:
d75f1793e6
Change-Id: I7a7c34980507393ec855c9e161ca0a922ed57fe4
Nicolas Geoffray [Fri, 1 Mar 2019 15:06:51 +0000 (07:06 -0800)]
Merge "Support dexopting shared libraries." am:
3275a6b245
am:
2e07ca0f15
Change-Id: Icee2bd2eddf07c5b47b841fab60eb8f5f35f852c
Fabian Kozynski [Tue, 5 Feb 2019 14:36:59 +0000 (09:36 -0500)]
Refactor CarrierTextController
The list of carriers is now created on the go, so it will always have
the same number of items as there are subscriptions.
Fixes code that reused same slotID into carrierName order.
Test: atest
Test: manual using DSDS
Change-Id: I2533738429b8f0f94c84110641e8c162d19f094a
Android Build Merger (Role) [Fri, 1 Mar 2019 14:59:36 +0000 (14:59 +0000)]
Merge "Merge changes I10c6ed68,I14d6defe am:
8dee71f101 am:
84817b5581 am:
b130dbccd8"
Jeff Sharkey [Fri, 1 Mar 2019 14:58:28 +0000 (14:58 +0000)]
Merge "All Parcelable CREATOR fields are @NonNull."
Nicolas Geoffray [Fri, 1 Mar 2019 14:57:46 +0000 (06:57 -0800)]
Merge "Support dexopting shared libraries."
am:
3275a6b245
Change-Id: I9c0c742f38296efa42fb719f27ad08a90e2b55b5
Roland Levillain [Fri, 1 Mar 2019 14:56:15 +0000 (06:56 -0800)]
Merge changes I10c6ed68,I14d6defe am:
8dee71f101 am:
84817b5581
am:
b130dbccd8
Change-Id: I52701fa0965283feb469e867dae9e702f37f3b4b
Paul Duffin [Fri, 1 Mar 2019 14:54:49 +0000 (06:54 -0800)]
Merge "Switch android.test and junit classes to use UnsupportedAppUsage" am:
7bb0bcd305
am:
b5ccf0e21c
Change-Id: I38729b9ea144ab550741436a7fe1aea99c376a05
Roland Levillain [Fri, 1 Mar 2019 14:46:35 +0000 (06:46 -0800)]
Merge changes I10c6ed68,I14d6defe am:
8dee71f101
am:
84817b5581
Change-Id: I66c0d80121dcc1a1dd9240716e6c3bd24eb293c5
Nicolas Geoffray [Fri, 1 Mar 2019 14:44:49 +0000 (14:44 +0000)]
Merge "Support dexopting shared libraries."
Aaron Heuckroth [Fri, 1 Mar 2019 14:43:25 +0000 (14:43 +0000)]
Merge "Tweak spacing on grid-based Global Actions Menu."
Paul Duffin [Fri, 1 Mar 2019 14:43:17 +0000 (06:43 -0800)]
Merge "Switch android.test and junit classes to use UnsupportedAppUsage"
am:
7bb0bcd305
Change-Id: Ie6fcc247d98d095cdb6b041a2551f727e4fee7d9
Roland Levillain [Fri, 1 Mar 2019 14:39:10 +0000 (06:39 -0800)]
Merge changes I10c6ed68,I14d6defe
am:
8dee71f101
Change-Id: Ia494f123d14c740bf456d75670b469bc7c8c33f0
Narayan Kamath [Fri, 1 Mar 2019 14:37:00 +0000 (14:37 +0000)]
Merge "CastTile: stop active projection (if any) on tile clicks"
Narayan Kamath [Fri, 1 Mar 2019 14:36:37 +0000 (14:36 +0000)]
Merge "CastTile : Cosmetic changes to the cast tile UX."
Paul Duffin [Fri, 1 Mar 2019 14:24:16 +0000 (14:24 +0000)]
Merge "Switch android.test and junit classes to use UnsupportedAppUsage"
Roland Levillain [Fri, 1 Mar 2019 14:22:49 +0000 (14:22 +0000)]
Merge changes I10c6ed68,I14d6defe
* changes:
Check Android Runtime (Boot) device configuration flag `enable_apex_image`.
Refactor unit test for Android Runtime (Boot) device configuration flags.
Richard Uhler [Tue, 26 Feb 2019 10:40:36 +0000 (10:40 +0000)]
Use a single list for available and committed rollbacks.
So that there is a single source of truth for pending backups and
pending restores. This fixes rollback of userdata for staged rollbacks.
Included in this change:
* Distinguish between PENDING_AVAILABLE, AVAILABLE, and COMMITTED
rollback states.
* Separate completeEnableRollback from makeRollbackAvailable.
* Make timestamp @NonNull and set it when rollback is made available.
* Don't listen for SESSION_UPDATED broadcasts.
* Factor out common code for ignoring saveRollbackData IOException.
* Other minor cleanups.
Test: atest RollbackTest
Test: atest StagedRollbackTest
Test: atest AppDataRollbackHelperTest
Bug:
124044231
Change-Id: I654a7827e9ed15659d0cb80e5a2c29c2660aea08
TreeHugger Robot [Fri, 1 Mar 2019 13:33:53 +0000 (13:33 +0000)]
Merge "Add thread atom that contains sum of filtered thread CPU usage"
Narayan Kamath [Wed, 27 Feb 2019 18:27:59 +0000 (18:27 +0000)]
CastTile : Cosmetic changes to the cast tile UX.
- Change the tile title to "Screen Cast".
- Always show the tile title as a primary label, and show
the casting or projection device as the secondary label.
- Also fixes an issue where the cast tile would show as disabled
when WiFi wasn't connected, despite the fact that the tile may
have been displaying an in-progress projection session.
Test: manual
Bug:
124753835
Change-Id: I15f9c0a80d288e5d9a77e87fd1f3135033fdb873
Andrei-Valentin Onea [Fri, 1 Mar 2019 11:47:15 +0000 (11:47 +0000)]
Merge "Add statslog logging for hidden api usage"
Issei Suzuki [Fri, 1 Mar 2019 11:02:05 +0000 (11:02 +0000)]
Merge "Add comment to clarify use case of the new constructors."
Martijn Coenen [Fri, 1 Mar 2019 10:43:50 +0000 (10:43 +0000)]
Merge "Add PARSE_IS_SYSTEM_DIR when parsing /system APEXes."
Paul Duffin [Fri, 15 Feb 2019 12:58:26 +0000 (12:58 +0000)]
Switch android.test and junit classes to use UnsupportedAppUsage
The UnsupportedAppUsage annotations could not be added directly to the
java files in src/ as they have to be built against the current api
which does not include the annotation. Instead this uses the same
technique as used for libcore/ojluni files and adds the annotations to
stub files (in hiddenapi/src) which are built as part of the
android.test.base-hiddenapi target. That target is added to a special
whitelist in build/soong/java/config/config.go which causes the
hiddenapi information to be extracted from the target.
Also, updates the preupload check to prevent anymore entries being
added to the config/hiddenapi-greylist.txt for android.test or junit
classes.
Bug:
73711752
Test: m cts-hiddenapi_flags-csv and check that it contained the
correct entries even though they had been removed from
config/hiddenapi-greylist.txt
Change-Id: Ifaf15d2751f54cb03f8402b866a0ee4da7acc4d2
Nicolas Geoffray [Tue, 26 Feb 2019 23:24:34 +0000 (23:24 +0000)]
Support dexopting shared libraries.
Test: adb shell setprop dalvik.vm.boot-image /system/framework/apex.art && see compilations in dalvik-cache
Test: BackgroundDexOptServiceIntegrationTests
Test: DexoptUtilsTest
Bug:
119800099
Change-Id: I3445b8743d576e09c9a339602307ba3a219db1fc
Abhijeet Kaur [Fri, 1 Mar 2019 10:15:42 +0000 (10:15 +0000)]
Merge "Bugreport Manager service clear binder identity"
Richard Uhler [Tue, 19 Feb 2019 10:31:21 +0000 (10:31 +0000)]
Test for userdata restore in staged rollback test.
Bug:
124044231
Test: frameworks/base/tests/RollbackTest$ atest
Change-Id: Ic323b2e45c05ac4706d96fe15b109fdceaf53da4
Remi NGUYEN VAN [Fri, 1 Mar 2019 07:11:20 +0000 (23:11 -0800)]
Merge "Set NetworkStack targetSdk to 28" am:
3e15c9f9ba am:
4be31060a2
am:
6026ca9552
Change-Id: I6c02ff70600b1dc32e989493e6dfa924c0ef8b61
Remi NGUYEN VAN [Fri, 1 Mar 2019 07:01:55 +0000 (23:01 -0800)]
Merge "Set NetworkStack targetSdk to 28" am:
3e15c9f9ba
am:
4be31060a2
Change-Id: I2575c6caaf3438338ab34d26c7900a28e7beac69
Remi NGUYEN VAN [Fri, 1 Mar 2019 06:52:43 +0000 (22:52 -0800)]
Merge "Set NetworkStack targetSdk to 28"
am:
3e15c9f9ba
Change-Id: Ic1fe1670f10cb921cf38bcc666142252eb0b749f
Remi NGUYEN VAN [Fri, 1 Mar 2019 06:43:21 +0000 (06:43 +0000)]
Merge "Set NetworkStack targetSdk to 28"
TreeHugger Robot [Fri, 1 Mar 2019 06:35:17 +0000 (06:35 +0000)]
Merge "Add null checks for attribute getters in View."
Jeff Sharkey [Thu, 28 Feb 2019 19:06:45 +0000 (12:06 -0700)]
All Parcelable CREATOR fields are @NonNull.
If they were null, then the Parcelable would fail to work.
Bug:
126726802
Test: manual
Change-Id: I7929ffa2f20e5de1c8e68e8263cca99496e9d014
Exempt-From-Owner-Approval: Trivial API annotations
Jeff Sharkey [Fri, 1 Mar 2019 06:28:24 +0000 (06:28 +0000)]
Merge "Translate selection arguments that are paths."
Jeff Sharkey [Thu, 28 Feb 2019 19:02:10 +0000 (12:02 -0700)]
To be @Nullable or @NonNull, that is the question.
Bug:
126699288,
126699496,
126700389
Bug:
126700085,
126701638,
126702005,
126700497
Test: manual
Change-Id: Idcbc2722ddcf014a9e5cef14321b4e2ce30adf9c
Jeff Sharkey [Thu, 28 Feb 2019 05:14:16 +0000 (22:14 -0700)]
Intercept unlink(), remove(), and rename().
Handles cases where apps try deleting paths returned in "_data"
columns, and where they try renaming across bind mounts.
Bug:
124349250
Test: atest android.appsecurity.cts.ExternalStorageHostTest#testExternalStorageRename
Change-Id: I7f4461bcacada80398eb95d051a0d29456f63499
TreeHugger Robot [Fri, 1 Mar 2019 05:32:31 +0000 (05:32 +0000)]
Merge "Check for NPE when sending enroll result"
Kevin Chyn [Fri, 1 Mar 2019 04:47:19 +0000 (04:47 +0000)]
Merge "Add logging for when cancel times out"
TreeHugger Robot [Fri, 1 Mar 2019 04:42:45 +0000 (04:42 +0000)]
Merge "Added NPE check on verifySameType()."
TreeHugger Robot [Fri, 1 Mar 2019 03:53:29 +0000 (03:53 +0000)]
Merge "Add missing ServiceType values to IntDef."
Patrick Huang [Fri, 1 Mar 2019 03:51:10 +0000 (19:51 -0800)]
Add euicc privileged actions and extras.
Bug:
122769846
Test: Test on phone
Change-Id: Ifcf6575c3c65cb38e8787e32bc04b0e4532f7170
Merged-In: Ifcf6575c3c65cb38e8787e32bc04b0e4532f7170
Varun Anand [Fri, 1 Mar 2019 03:35:07 +0000 (19:35 -0800)]
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am:
93dfa10da4 am:
a8cb41a94d
am:
fcdb1380ac -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1
02c50ef1d1 is in history
Change-Id: I3ddc59f7abb5e3c0a2f4f54bb68632578948ee89
Varun Anand [Fri, 1 Mar 2019 03:25:53 +0000 (19:25 -0800)]
Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am:
93dfa10da4
am:
a8cb41a94d
Change-Id: Ieb10b88344dd4436913426961e6999577a469f36
Varun Anand [Fri, 1 Mar 2019 03:18:33 +0000 (19:18 -0800)]
Merge "Remove ConnectivityManager and its usages from NetworkStatsService."
am:
93dfa10da4
Change-Id: I2a2809d3a2ee4106cc131d61ace401f31c187844
Hai Shalom [Thu, 28 Feb 2019 20:40:40 +0000 (12:40 -0800)]
[OWE] Rename isOweSupported to isEnhancedOpenSupported
Stick to the official WFA marketing name in this public API.
Bug:
125850601
Test: atest com.android.server.wifi
Test: Use Settings to scan and connect to OWE network
Change-Id: I4eb9fb99500d7d56489c00ef0ee2ac571ff162d1
Varun Anand [Fri, 1 Mar 2019 03:06:06 +0000 (03:06 +0000)]
Merge "Remove ConnectivityManager and its usages from NetworkStatsService."
Android Build Merger (Role) [Fri, 1 Mar 2019 02:55:26 +0000 (02:55 +0000)]
Merge "Merge "add NonNull and Nullable annotation to APIs" am:
c931e9b0c0 am:
715c2d87cc am:
3bc4573765"
Kevin Chyn [Fri, 1 Mar 2019 02:55:10 +0000 (18:55 -0800)]
Check for NPE when sending enroll result
It's possible for the client to crash and have the service continue to
receive results for a short amount of time.
Bug:
126212114
Test: system server doesn't die anymore
Change-Id: I574b605eba50169a611cae8e95c46aa61defcb9c
TreeHugger Robot [Fri, 1 Mar 2019 02:55:04 +0000 (02:55 +0000)]
Merge "Fixed PASSWORD_COMPLEXITY_HIGH javadoc to require complex PIN of length at least 8"
Chen Xu [Fri, 1 Mar 2019 02:54:02 +0000 (18:54 -0800)]
Merge "add NonNull and Nullable annotation to APIs" am:
c931e9b0c0 am:
715c2d87cc
am:
3bc4573765
Change-Id: I35e81dcc8e091e91cf335587849c596134781a7c
Chen Xu [Fri, 1 Mar 2019 02:44:41 +0000 (18:44 -0800)]
Merge "add NonNull and Nullable annotation to APIs" am:
c931e9b0c0
am:
715c2d87cc
Change-Id: I0c9f9cea0afaf221506906b79c18b562caba355f
Remi NGUYEN VAN [Fri, 1 Mar 2019 01:01:24 +0000 (10:01 +0900)]
Set NetworkStack targetSdk to 28
Test: flashed, booted, WiFi works
Change-Id: I7bbd7eb563432a290358d16652c0ae69e9772002
Kevin Chyn [Fri, 1 Mar 2019 02:40:55 +0000 (02:40 +0000)]
Merge "Add NonNull to remaining BiometricPrompt Builder methods"
Kevin Chyn [Thu, 28 Feb 2019 23:51:43 +0000 (15:51 -0800)]
Add NonNull to remaining BiometricPrompt Builder methods
Test: make -j56 update-api
Test: builds
Fixes:
126799710
Change-Id: Ifc074863b5ffa5c69f7b8edb7aecbad9220faab4
Chen Xu [Fri, 1 Mar 2019 02:33:17 +0000 (18:33 -0800)]
Merge "add NonNull and Nullable annotation to APIs"
am:
c931e9b0c0
Change-Id: I4ec29b409230a04be5897ccde9bb524dc1eadbdf
Qasid Sadiq [Fri, 1 Mar 2019 02:25:26 +0000 (02:25 +0000)]
Merge "Revert "Revert "Fix a11y cache correctness bug"""
Chen Xu [Fri, 1 Mar 2019 02:17:33 +0000 (02:17 +0000)]
Merge "add NonNull and Nullable annotation to APIs"
TreeHugger Robot [Fri, 1 Mar 2019 02:05:28 +0000 (02:05 +0000)]
Merge "Ensure all gesture state is reset between gestures"
Felipe Leme [Fri, 1 Mar 2019 02:04:30 +0000 (02:04 +0000)]
Merge "Autofill, Content Capture, and Augmented Autofill API fixes:"
Andrii Kulian [Fri, 1 Mar 2019 02:01:38 +0000 (02:01 +0000)]
Merge "Report top resumed state only after previous activity lost it"
TreeHugger Robot [Fri, 1 Mar 2019 01:52:56 +0000 (01:52 +0000)]
Merge "Add acquired log"
Nathan Harold [Fri, 1 Mar 2019 01:50:06 +0000 (17:50 -0800)]
Merge "Add a Constant for CellInfo#UNAVAILABLE_LONG" am:
572b1ee84b am:
51735ba270
am:
8502172502
Change-Id: Ib12baf92ef3315cb9c1dc8365f0f0aa0bb725dd1
Yueming Wang [Fri, 1 Mar 2019 01:41:27 +0000 (01:41 +0000)]
Merge "Create a constant for enterprise root uri."
Nathan Harold [Fri, 1 Mar 2019 01:39:15 +0000 (17:39 -0800)]
Merge "Add a Constant for CellInfo#UNAVAILABLE_LONG" am:
572b1ee84b
am:
51735ba270
Change-Id: I0a77e0367a846ce03f2eea639026d1fb8afdacda
Shi Yuanjie [Fri, 1 Mar 2019 01:30:57 +0000 (17:30 -0800)]
Merge "Fix to hide phone number printed in the log" am:
b967dce9d9 am:
ae023634bf
am:
28ebdcb28c
Change-Id: I0c8c324477e46db6dfd6bc770d7154decb0d6276
Nathan Harold [Fri, 1 Mar 2019 01:30:00 +0000 (17:30 -0800)]
Merge "Add a Constant for CellInfo#UNAVAILABLE_LONG"
am:
572b1ee84b
Change-Id: I7c19563ccd4ceda3a32024db2fcc5e9526aa2d4c
Aurimas Liutikas [Fri, 1 Mar 2019 01:22:36 +0000 (17:22 -0800)]
Add null checks for attribute getters in View.
If the getter calls are made View#saveAttributeDataForStyleable
this might lead to null pointer exception. Add checks to prevent
that.
Test: None
Bug:
126780975
Change-Id: I3e27d6073b65367010bc9d5b002cf9791d434a72
Chavi Weingarten [Fri, 1 Mar 2019 01:19:28 +0000 (01:19 +0000)]
Merge "Change Instrumentation to call injectInputAfterTransactionApplied"