OSDN Git Service
Andrei-Valentin Onea [Thu, 7 Mar 2019 16:30:32 +0000 (16:30 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Treehugger Robot [Thu, 7 Mar 2019 13:43:36 +0000 (13:43 +0000)]
Merge "Exclude Emergency Dialer from recent app list."
Mark Chien [Thu, 7 Mar 2019 13:21:53 +0000 (13:21 +0000)]
Merge "Fix TetheringEntitlementValueListener related API"
Leo Hsu [Wed, 6 Mar 2019 07:25:28 +0000 (15:25 +0800)]
Exclude Emergency Dialer from recent app list.
Emergency Dialer should not show up in recent app list.
Bug:
112168722
Bug:
127585929
Test: Long press power key, tap Emergency, quit Emergency Dialer, and
check recent app list.
Change-Id: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Merged-In: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Andrei-Valentin Onea [Thu, 7 Mar 2019 10:20:28 +0000 (10:20 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Treehugger Robot [Thu, 7 Mar 2019 08:56:39 +0000 (08:56 +0000)]
Merge "Do not call noteOp if checkPermission fails"
Treehugger Robot [Thu, 7 Mar 2019 05:42:07 +0000 (05:42 +0000)]
Merge "Migrate frameworks/base/tests/net/ to androidx.test"
markchien [Wed, 6 Mar 2019 08:25:00 +0000 (16:25 +0800)]
Fix TetheringEntitlementValueListener related API
Test: -build, flash, boot
-atest FrameworksNetTests
bug:
126701557
bug:
126392011
Change-Id: I6dda10fbfe8ffaef71269617750a22563396f5ea
Remi NGUYEN VAN [Thu, 7 Mar 2019 03:54:22 +0000 (03:54 +0000)]
Merge "Fix SocketUtils API"
Treehugger Robot [Thu, 7 Mar 2019 01:07:34 +0000 (01:07 +0000)]
Merge "add NonNull annotation to API"
Hall Liu [Thu, 7 Mar 2019 00:11:31 +0000 (00:11 +0000)]
Merge "API tweaks"
Treehugger Robot [Wed, 6 Mar 2019 23:28:33 +0000 (23:28 +0000)]
Merge "Reset callNetworkType and CallQuality after calls"
Brad Ebinger [Wed, 6 Mar 2019 22:47:58 +0000 (22:47 +0000)]
Merge "Add Nullable/NonNull Annotations where appropriate."
Pengquan Meng [Wed, 6 Mar 2019 21:52:32 +0000 (21:52 +0000)]
Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
Chad Brubaker [Wed, 6 Mar 2019 00:40:33 +0000 (16:40 -0800)]
Do not call noteOp if checkPermission fails
This causes an access to be logged for runtime permissions even if the
permission is denied, which is incorrect.
Fixes:
127297477
Bug:
116258458
Test: Verified using steps in b/
127297477
Change-Id: I8306aa273b7d4dfab40a2a6d8d1ef6f4d8cc2c54
Nathan Harold [Wed, 6 Mar 2019 21:41:18 +0000 (21:41 +0000)]
Merge "Move Annotations for getCellSignalStrengths"
Pengquan Meng [Wed, 6 Mar 2019 21:36:46 +0000 (21:36 +0000)]
Merge "Add carrier config for 5G Icon"
Treehugger Robot [Wed, 6 Mar 2019 20:51:42 +0000 (20:51 +0000)]
Merge "Added secondary owners on per-file entries."
Steven Moreland [Wed, 6 Mar 2019 20:02:57 +0000 (20:02 +0000)]
Merge "NativeHandle.java: set Nullable/NonNull"
Hall Liu [Wed, 27 Feb 2019 01:58:53 +0000 (17:58 -0800)]
API tweaks
* Make the PhoneAccountSuggestion ctor public
* Change protection level of the bind-suggestion-service permission to
signature-only.
Fixes:
126442573
Fixes:
126442403
Test: CTS
Change-Id: Ic6d44989efd28420a5e9e7e9c365318538d140bb
Nathan Harold [Wed, 6 Mar 2019 19:10:40 +0000 (11:10 -0800)]
Move Annotations for getCellSignalStrengths
As per API council script's feedback, the scripts
do not support having nullable annotations preceding
the return tupe. Moving the @NonNull annotations to a
script friendly location.
Bug:
126700393
Test: make update-api && make
&& make offline-sdk-docs (no functional change)
Change-Id: Ie063ffa2e311f4eb7d9e07cd5ee212af97d9d45d
Pengquan Meng [Thu, 6 Dec 2018 00:26:42 +0000 (16:26 -0800)]
Add carrier config for 5G Icon
Bug:
111453000
Test: build
Merged-In: Ie4b331aaec3981dea0eeada436a2123fe9287b74
Change-Id: Ie4b331aaec3981dea0eeada436a2123fe9287b74
Nazanin Bakhshi [Wed, 6 Mar 2019 19:10:58 +0000 (19:10 +0000)]
Merge "disallow changing from multi-sim to single-sim for carrier apps"
Andrei-Valentin Onea [Wed, 6 Mar 2019 18:01:47 +0000 (18:01 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:19:05 +0000 (17:19 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:18:05 +0000 (17:18 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Steven Moreland [Tue, 5 Mar 2019 01:56:30 +0000 (17:56 -0800)]
NativeHandle.java: set Nullable/NonNull
Fixes:
126700972
Test: hidl_test_java
Test: atest android.os.cts.HwBinderTest
Change-Id: Id45c6d0757913014028f7629db78b64f27cad084
Andrei-Valentin Onea [Wed, 6 Mar 2019 17:17:27 +0000 (17:17 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Felipe Leme [Wed, 6 Mar 2019 17:10:27 +0000 (09:10 -0800)]
Added secondary owners on per-file entries.
Test: none
Bug:
126945732
Change-Id: I4b9786c9b01993f230f962a54e08127684b3289e
Andrei Onea [Wed, 6 Mar 2019 15:17:47 +0000 (15:17 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.accounts
android.app
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I65c961e3f59b9868156b3ee6a3b1cab81b0e9d25
Change-Id: I47b5f45ced1c6e385ed24424e442c76fc0487af7
Andrei Onea [Wed, 6 Mar 2019 15:41:14 +0000 (15:41 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.speech
android.telephony.mbms.vendor
android.view
android.webkit
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10
Change-Id: I04104cf3852a0a7440676ccc55dd96c1eec730c4
Adrian Roos [Wed, 6 Mar 2019 12:43:55 +0000 (12:43 +0000)]
Merge "apilint: Lint unhidden @IntDef and @LongDef"
Adrian Roos [Wed, 6 Mar 2019 12:38:10 +0000 (13:38 +0100)]
apilint: Lint unhidden @IntDef and @LongDef
@IntDefs and @LongDefs cannot be stored in a .class file, because the constant
names are lost. Instead, they are packaged out-of-band.
Therefore, they should never be in the API.
Test: python tools/apilint/apilint.py api/current.txt
Change-Id: If22e0cf7db0bb90dae6174bf546f2ec8be4e5458
Treehugger Robot [Wed, 6 Mar 2019 11:49:03 +0000 (11:49 +0000)]
Merge "Add permission and permission.xsd"
Sundong Ahn [Wed, 6 Mar 2019 10:04:12 +0000 (10:04 +0000)]
Merge "Add default-permissions"
Wei Sheng Shih [Wed, 6 Mar 2019 09:32:11 +0000 (09:32 +0000)]
Merge "Revert "API tweaks""
Wei Sheng Shih [Wed, 6 Mar 2019 09:15:17 +0000 (09:15 +0000)]
Revert "API tweaks"
This reverts commit
f3e0eb8b0c9e334138b0e663dfb498e34144877b.
Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered
Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
Remi NGUYEN VAN [Wed, 6 Mar 2019 09:02:34 +0000 (18:02 +0900)]
Fix SocketUtils API
- connect, sendTo, bind were added as public API, so do not need to be
maintained as SystemApi in SocketUtils. These APIs were added in Q
timeframe.
- Add @Nullable/@NonNull annotations.
Bug:
126699304
Bug:
126477266
Test: booted, WiFi works
Change-Id: I3f086ac8952cfd6a4d8f861d2e1c7aa1ca8be999
Sundong Ahn [Thu, 3 Jan 2019 02:52:04 +0000 (11:52 +0900)]
Add permission and permission.xsd
This module is for API check of java file generated from
permission.xsd
Bug:
80453829
Test: m -j
Change-Id: Ie70693400a6c9b261c8b1ca6197206ac3d17a271
Sundong Ahn [Thu, 3 Jan 2019 08:37:10 +0000 (17:37 +0900)]
Add default-permissions
This module is for API check of java file generated from
default-permissions.xsd
Bug:
80453829
Test: m -j
Change-Id: Ic2d6b9a64ceb19711ce6f3fb2da0f1f01d17ebc5
Chen Xu [Wed, 6 Mar 2019 04:58:36 +0000 (04:58 +0000)]
Merge "migrate cdma home eri from resource overlay to carrierconfig"
Chen Xu [Wed, 6 Mar 2019 02:50:20 +0000 (02:50 +0000)]
Merge "migrate cdma home eri from resource overlay to carrierconfig"
chen xu [Sat, 9 Feb 2019 01:40:33 +0000 (17:40 -0800)]
migrate cdma home eri from resource overlay to carrierconfig
Bug:
121145488
Test: Build
Change-Id: I1ec160883282c8819727d3d56c909d9a1c7fd5d2
(cherry picked from commit
eb07e4ebff8c53f1e183b3de8499c5b0bf92c1f9)
Merged-in: I1ec160883282c8819727d3d56c909d9a1c7fd5d2
Chiachang Wang [Wed, 6 Mar 2019 00:49:20 +0000 (00:49 +0000)]
Merge "Update description based on API feedback"
Brad Ebinger [Thu, 28 Feb 2019 21:10:32 +0000 (13:10 -0800)]
Add Nullable/NonNull Annotations where appropriate.
Bug:
126701249
Bug:
126701136
Bug:
126701236
Bug:
126700627
Bug:
126702224
Test: atest FrameworksTelephonyTests
Merged-In: I4cfba9dee766fa9d34f578db4143919c3f203a20
Change-Id: I4cfba9dee766fa9d34f578db4143919c3f203a20
chen xu [Thu, 28 Feb 2019 21:50:23 +0000 (13:50 -0800)]
migrate cdma home eri from resource overlay to carrierconfig
remove config from resource overlay
Bug:
121145488
Test: Manual
Change-Id: Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1
(cherry picked from commit
4933ef2310a45a5d24b1f1cd2533382c5e96487f)
Merged-in: Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1
Nazanin Bakhshi [Fri, 1 Mar 2019 19:54:41 +0000 (11:54 -0800)]
disallow changing from multi-sim to single-sim for carrier apps
Bug:
125122645
Test: build
Change-Id: Ie422577e1f710b033ed85caed9a3e864aadff061
Merged-In: Ie422577e1f710b033ed85caed9a3e864aadff061
(cherry picked from commit
36ede9a2e66a83464590e8998ebdd4bc6feaf240)
Nazanin Bakhshi [Tue, 5 Mar 2019 22:07:17 +0000 (22:07 +0000)]
Merge "create getModemEnabled function in PhoneConfigurationManager"
Treehugger Robot [Tue, 5 Mar 2019 21:33:25 +0000 (21:33 +0000)]
Merge "Fix that the update to v1 signed version fails if apk verity is enabled"
Jack Yu [Tue, 5 Mar 2019 21:26:30 +0000 (21:26 +0000)]
Merge changes from topic "iwlan_api"
* changes:
Added annotations to the APIs
Fixed IWLAN related APIs issue
Hall Liu [Tue, 5 Mar 2019 21:18:40 +0000 (21:18 +0000)]
Merge "API tweaks"
Chen Xu [Tue, 5 Mar 2019 21:10:41 +0000 (21:10 +0000)]
Merge "fix the issue that sending wrong preferred networktype to RIL"
chen xu [Tue, 5 Mar 2019 01:19:48 +0000 (17:19 -0800)]
fix the issue that sending wrong preferred networktype to RIL
Bug:
126805258
Test: Manual
Change-Id: Ifb1fc21423a09f0d000553d4d06bafa023adc9d6
Merged-in: Ifb1fc21423a09f0d000553d4d06bafa023adc9d6
Treehugger Robot [Tue, 5 Mar 2019 19:07:19 +0000 (19:07 +0000)]
Merge "add missing annotation for CarrierIdentifier"
Treehugger Robot [Tue, 5 Mar 2019 19:06:30 +0000 (19:06 +0000)]
Merge "add missing annotation for TelephonyManager APIs"
Jack Yu [Tue, 5 Mar 2019 19:00:12 +0000 (11:00 -0800)]
Added annotations to the APIs
Added @Nullable and @NonNull to several APIs.
Test: Manual
Bug:
126701840
Bug:
126702171
Bug:
126702057
Bug:
126702564
Bug:
126703014
Bug:
126702900
Change-Id: Ib4d8b2b45b11ef5d70cd229f33b8c8f903e5e6ee
Jack Yu [Fri, 1 Mar 2019 22:52:59 +0000 (14:52 -0800)]
Fixed IWLAN related APIs issue
Fixed APIs that not meeting API review requirement.
1. Changed createXxxServiceProvider to onCreateXxxServiceProvider
2. Added builder for NetworkRegistrationState
Test: Manual
Bug:
126552434
Change-Id: Idb2411a47caf61e83fe26b98e393fa851ac1759d
Treehugger Robot [Tue, 5 Mar 2019 18:23:36 +0000 (18:23 +0000)]
Merge "WIFI cannot be automatically connected"
Adrian Roos [Tue, 5 Mar 2019 18:15:44 +0000 (18:15 +0000)]
Merge "Apilint: No longer flag interface callbacks"
Adrian Roos [Tue, 5 Mar 2019 18:15:11 +0000 (18:15 +0000)]
Merge "apilint: decorator-based verifier registration"
Adrian Roos [Tue, 5 Mar 2019 18:14:42 +0000 (18:14 +0000)]
Merge "Apilint: lint for URL/URI"
Adrian Roos [Thu, 28 Feb 2019 11:49:19 +0000 (12:49 +0100)]
Apilint: No longer flag interface callbacks
With default interfaces, this is no longer necessary.
Test: python apilint_test.py
Change-Id: Ifa9ba24511a82797089934009d9096c3a589e7f6
Suren Baghdasaryan [Tue, 5 Mar 2019 18:06:46 +0000 (18:06 +0000)]
Merge "Add min_score_adj into LmkKillOccurred event"
Jack Yu [Tue, 5 Mar 2019 17:36:51 +0000 (17:36 +0000)]
Merge "Add Carriers.SKIP_464XLAT and includes ApnSetting"
Adrian Roos [Tue, 5 Mar 2019 17:31:37 +0000 (18:31 +0100)]
apilint: decorator-based verifier registration
Registers verifiers via a decorator to avoid error-prone registration
elsewhere.
Test: Run apilint before and after the change, verify identical output
Change-Id: I77ae47a2f3f1a486bb78d3167f8439ade6fc28ab
Pengquan Meng [Fri, 22 Feb 2019 03:19:47 +0000 (19:19 -0800)]
[API Feedback] Rename getChannelNumber to getNrarfcn
For consistency with the rest of the public API, the CellIdentityNr structure
should use the specific term for the channel number that is returned
(NR-ARFCN) in the API name rather than the generic getChannelNumber().
Bug:
125025882
Test: build + cts + unit test
Change-Id: I0513afc19171ea169f83ccb7fe3b378af79c8f4b
Brett Chabot [Mon, 4 Mar 2019 22:14:56 +0000 (14:14 -0800)]
Migrate frameworks/base/tests/net/ to androidx.test
Test: atest FrameworksNetTests
Change-Id: Iaa59d606f5e1678cc5aaca9ed37e184fad894e5d
Adrian Roos [Thu, 28 Feb 2019 11:45:00 +0000 (12:45 +0100)]
Apilint: lint for URL/URI
Test: python apilint_test.py
Change-Id: Iebe3b48df7ed69e0b5f5ff372b72f68ca9f8efec
Adrian Roos [Tue, 5 Mar 2019 16:43:24 +0000 (16:43 +0000)]
Merge changes Icc2810f5,Ib0ad635e
* changes:
Apilint: report all implemented interfaces and fix false positives Test: python apilint_test.py
Apilint: properly parse packages with numbers
Nicolas Geoffray [Tue, 5 Mar 2019 15:37:27 +0000 (15:37 +0000)]
Merge "Remove calls to VMRuntime methods that are no-ops."
Suren Baghdasaryan [Mon, 4 Mar 2019 19:09:31 +0000 (11:09 -0800)]
Add min_score_adj into LmkKillOccurred event
Log min_score_adj when lmkd kills a process to determine the oom_score
levels that lmkd considers during the kill.
Accompanies Piper cl/
236692672
Bug:
123024834
Change-Id: Ibfec13ef80ef1d74f5f224dde2e24970f7a88bfa
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Tyler Gunn [Tue, 5 Mar 2019 15:21:48 +0000 (15:21 +0000)]
Merge "Correct nullability and final constraints on new APIs."
Treehugger Robot [Tue, 5 Mar 2019 14:59:33 +0000 (14:59 +0000)]
Merge "Set module min_sdk_version to 28"
Nicolas Geoffray [Mon, 4 Mar 2019 13:23:34 +0000 (13:23 +0000)]
Remove calls to VMRuntime methods that are no-ops.
Test: m
(Cherry-picked from:
5735cc7a116598eb9eb635857605394f67ef005e)
Change-Id: If2e6afe21f6efcb141f3a4428ff9154b68f08a1d
Merged-In: Ibe849f56f5fe8af1415dc6c85b484d0edca518ec
Chiachang Wang [Tue, 5 Mar 2019 12:31:57 +0000 (20:31 +0800)]
Update description based on API feedback
Bug:
126883311
Test: Build pass
atest NetworkStackTests
Change-Id: If3d21829bbe98d125215abe96247ca7d5a66d1f3
Jack Yu [Tue, 5 Mar 2019 06:56:14 +0000 (06:56 +0000)]
Merge "Fixed that DcTracker does not use correct data registration info"
Jack Yu [Tue, 26 Feb 2019 21:10:05 +0000 (13:10 -0800)]
Fixed that DcTracker does not use correct data registration info
Fixed by using correct info from the corresponding transport
Test: Unit tests + manual
Bug:
126436426
Merged-In: Ie8ae20423b794622b6a6141faf68c01b75c144ce
Change-Id: Ie8ae20423b794622b6a6141faf68c01b75c144ce
(cherry picked from commit
1fa6cf157806673ca65383d281ca344329e28c28)
Treehugger Robot [Tue, 5 Mar 2019 02:16:42 +0000 (02:16 +0000)]
Merge "Move PublicFormat definition to libui"
Remi NGUYEN VAN [Tue, 5 Mar 2019 01:14:54 +0000 (10:14 +0900)]
Set module min_sdk_version to 28
The modules are not actually compatible with 28, but this is necessary
as tooling does not support "Q" as a version in the APK.
This will need to be changed to the new version number as soon as it is
available.
Test: m
Change-Id: I1d88f80c293b4667244d219a6989dd11be90f12a
Varun Anand [Tue, 5 Mar 2019 01:37:30 +0000 (01:37 +0000)]
Merge "Fix isActiveNetworkMetered for VPNs."
Hall Liu [Wed, 27 Feb 2019 01:58:53 +0000 (17:58 -0800)]
API tweaks
* Make the PhoneAccountSuggestion ctor public
* Change protection level of the bind-suggestion-service permission to
signature-only.
Fixes:
126442573
Fixes:
126442403
Test: CTS
Change-Id: Ie1616e86df6814e4aa05659d4aa3aca1959519d2
Yuuki Habu [Fri, 22 Feb 2019 02:29:26 +0000 (11:29 +0900)]
Add Carriers.SKIP_464XLAT and includes ApnSetting
Add the below flag as well and they are hidden now
- SKIP464_XLAT_DEFAULT
- SKIP464_XLAT_DISABLE
- SKIP464_XLAT_ENABLE
Support new flag skip464xlat in ApnSetting
Bug:
69949375
Test: run TelephonyProviderTest
Change-Id: Ia85be92a41a7c1a0b8176718d17469880a0c42cb
chen xu [Sun, 3 Mar 2019 23:57:12 +0000 (15:57 -0800)]
add missing annotation for TelephonyManager APIs
Bug:
126702627
Test: Build
Change-Id: I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c
Merged-in: I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c
Treehugger Robot [Mon, 4 Mar 2019 22:47:16 +0000 (22:47 +0000)]
Merge "Extract android_media_Utils.cpp as a lib"
Michele Berionne [Mon, 4 Mar 2019 21:12:06 +0000 (21:12 +0000)]
Merge "Move the check on multisim support when switch configuration is done"
Brad Ebinger [Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)]
Merge "Update ImsSsData/ImsSsInfo API based on API council feedback."
Jordan Liu [Mon, 4 Mar 2019 20:18:50 +0000 (20:18 +0000)]
Merge "Add NonNull and Nullable annotations"
Nazanin Bakhshi [Sat, 2 Mar 2019 01:25:26 +0000 (17:25 -0800)]
create getModemEnabled function in PhoneConfigurationManager
Bug:
124402911
Test: build
Change-Id: I7b22c5b0dbe95a8e5be2e0cbf3199841d275dac7
Merged-In: I7b22c5b0dbe95a8e5be2e0cbf3199841d275dac7
(cherry picked from commit
24183ad67acd9fcf3917bd56484212740578f36c)
Michele Berionne [Mon, 4 Mar 2019 19:01:42 +0000 (19:01 +0000)]
Merge "Changes to APIs for CarrierRestrictionRules class"
Michele [Fri, 1 Mar 2019 06:38:33 +0000 (22:38 -0800)]
Changes to APIs for CarrierRestrictionRules class
Add @NonNull annotation where applicable.
Rename isCarrierIdentifiersAllowed into areCarrierIdentifiersAllowed.
Make Builder class final.
Bug:
126375826
Bug:
126699079
Bug:
126700761
Test: Compilation
Change-Id: I1a02bc007f147597df97eaa55c00fd31a952870b
Amit Mahajan [Mon, 4 Mar 2019 18:23:30 +0000 (18:23 +0000)]
Merge "Adding new APN type for Mission Critical Services."
Tyler Gunn [Thu, 28 Feb 2019 19:33:42 +0000 (11:33 -0800)]
Correct nullability and final constraints on new APIs.
Per API review, correct nullability and final constraints on new Telecom
APIs.
Test: Build API.
Fixes:
126700293
Fixes:
126699447
Fixes:
126700465
Fixes:
126702895
Fixes:
126702527
Change-Id: Ic19664b156410e79a307b2af0d5672dc19f93c59
Merged-In: Icec15403493de596194a61b27bb3e1031fdc1099
Treehugger Robot [Mon, 4 Mar 2019 16:22:20 +0000 (16:22 +0000)]
Merge "Fix javadoc HTML escaping."
Slava Shklyaev [Mon, 4 Mar 2019 14:42:17 +0000 (14:42 +0000)]
Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs.""""
Slava Shklyaev [Mon, 4 Mar 2019 14:39:56 +0000 (14:39 +0000)]
Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""
This reverts commit
b255be1307aeae47ca7e8ee72ab4da670a1c49f1.
Reason for revert: the commit being reverted fixed git_master but broke aosp-master. This revert is aimed to fix aosp-master while not touching git_master.
DO NOT MERGE: This change is aimed at aosp-master only and should not be merged into git_master.
Change-Id: Ie5aaabb211affe2d21daaf87809641276d9d4707
Neil Fuller [Mon, 4 Mar 2019 12:14:59 +0000 (12:14 +0000)]
Merge "Use new libcore filegroup variable"
Slava Shklyaev [Mon, 4 Mar 2019 11:49:34 +0000 (11:49 +0000)]
Merge "Revert "Revert "Correct nullability and final constraints on new APIs."""
Slava Shklyaev [Mon, 4 Mar 2019 11:47:11 +0000 (11:47 +0000)]
Revert "Revert "Correct nullability and final constraints on new APIs.""
This reverts commit
8462c66bd52f3132c3fa03475fcab2af30618f67.
Reason for revert: Looks like this change broke the build.
Change-Id: I4cff1ec1211e278d5e5734f1594c096722293662
Treehugger Robot [Mon, 4 Mar 2019 11:43:48 +0000 (11:43 +0000)]
Merge "Add @Nullable to new method"
Josh Hou [Mon, 4 Mar 2019 11:19:50 +0000 (19:19 +0800)]
add NonNull annotation to API
Bug:
126700962
Test: Build pass
Change-Id: I50d8924b6f3323016cd68faa4769e608701b2134