Commit Graph

383605 Commits

Author SHA1 Message Date
Chad Brubaker
e23da7135a Merge "Do not call noteOp if checkPermission fails"
am: bc9b1b6f94

Change-Id: I53347c7a897b079268d9c8af704664a832eae581
2019-03-07 01:10:53 -08:00
Treehugger Robot
bc9b1b6f94 Merge "Do not call noteOp if checkPermission fails" 2019-03-07 08:56:39 +00:00
Brett Chabot
dc1077d5db Merge "Migrate frameworks/base/tests/net/ to androidx.test"
am: 58038da960

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
2019-03-06 21:51:50 -08:00
Treehugger Robot
58038da960 Merge "Migrate frameworks/base/tests/net/ to androidx.test" 2019-03-07 05:42:07 +00:00
Remi NGUYEN VAN
f0ef74dc7a Merge "Fix SocketUtils API"
am: 3da7809ae4

Change-Id: I03e0eb60d71cba27e57f8ee7832269bbd75f5344
2019-03-06 20:13:28 -08:00
Remi NGUYEN VAN
3da7809ae4 Merge "Fix SocketUtils API" 2019-03-07 03:54:22 +00:00
Josh Hou
6131255e77 Merge "add NonNull annotation to API"
am: fd2bb72030

Change-Id: Idf5a7df74815a9e339cf4313506f269ddbdce5d1
2019-03-06 17:32:50 -08:00
Treehugger Robot
fd2bb72030 Merge "add NonNull annotation to API" 2019-03-07 01:07:34 +00:00
Hall Liu
4c3e0ccfa5 Merge "API tweaks"
am: f3fbbeaa05

Change-Id: I3d45d13a482125edd91ec86e5c297f9fdb976072
2019-03-06 16:33:02 -08:00
Hall Liu
f3fbbeaa05 Merge "API tweaks" 2019-03-07 00:11:31 +00:00
Jordan Liu
dd0e480a7d Merge "Reset callNetworkType and CallQuality after calls"
am: 5819a3378d

Change-Id: Ie7a8141b002693946967eb4b0d70fae299be03bc
2019-03-06 15:44:19 -08:00
Treehugger Robot
5819a3378d Merge "Reset callNetworkType and CallQuality after calls" 2019-03-06 23:28:33 +00:00
Brad Ebinger
17b85fea09 Merge "Add Nullable/NonNull Annotations where appropriate."
am: eb4d20673f

Change-Id: Idc4e4d59c4773832111ff4383b1aa494d539f2d9
2019-03-06 15:04:11 -08:00
Brad Ebinger
eb4d20673f Merge "Add Nullable/NonNull Annotations where appropriate." 2019-03-06 22:47:58 +00:00
Pengquan Meng
b7f5e3782c Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
am: 8273d66ebc

Change-Id: I5da974b3b914c2581e8b315016ee2c2ff53ad45d
2019-03-06 14:32:03 -08:00
Nathan Harold
7c59ddb0b8 Merge "Move Annotations for getCellSignalStrengths"
am: 5ba92cf940

Change-Id: I6b91cdd94c5367ec4f89b7959d746faae10df1ef
2019-03-06 13:54:50 -08:00
Pengquan Meng
8273d66ebc Merge "[API Feedback] Rename getChannelNumber to getNrarfcn" 2019-03-06 21:52:32 +00:00
Pengquan Meng
14a78540b8 Merge "Add carrier config for 5G Icon"
am: 2aee6901fb

Change-Id: Iec2c01555d1200f707ee41f23d7ef75799d678f7
2019-03-06 13:46:02 -08:00
Chad Brubaker
a2875a1adf 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
2019-03-06 13:45:53 -08:00
Nathan Harold
5ba92cf940 Merge "Move Annotations for getCellSignalStrengths" 2019-03-06 21:41:18 +00:00
Pengquan Meng
2aee6901fb Merge "Add carrier config for 5G Icon" 2019-03-06 21:36:46 +00:00
Felipe Leme
0d6599a4e2 Merge "Added secondary owners on per-file entries."
am: 6d80c7a6e4

Change-Id: I64bd54a36864d957e30c2920698dea03717c6a0d
2019-03-06 13:00:38 -08:00
Treehugger Robot
6d80c7a6e4 Merge "Added secondary owners on per-file entries." 2019-03-06 20:51:42 +00:00
Steven Moreland
b5e85d6bb6 Merge "NativeHandle.java: set Nullable/NonNull"
am: 6792c595a2

Change-Id: I09cdb1ce3cc64cb8ca42a13b307b93b5dab8e42c
2019-03-06 12:28:23 -08:00
Steven Moreland
6792c595a2 Merge "NativeHandle.java: set Nullable/NonNull" 2019-03-06 20:02:57 +00:00
Hall Liu
ee609ff1c1 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
2019-03-06 11:32:18 -08:00
Nazanin Bakhshi
fbd7a667d1 Merge "disallow changing from multi-sim to single-sim for carrier apps"
am: 27c8f495f2

Change-Id: Iec876a398bec6fa2c61b633d7ba8e999e4742964
2019-03-06 11:24:04 -08:00
Nathan Harold
bbe345fa97 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
2019-03-06 11:22:20 -08:00
Pengquan Meng
e36b791729 Add carrier config for 5G Icon
Bug: 111453000
Test: build
Merged-In: Ie4b331aaec3981dea0eeada436a2123fe9287b74
Change-Id: Ie4b331aaec3981dea0eeada436a2123fe9287b74
2019-03-06 11:13:39 -08:00
Nazanin Bakhshi
27c8f495f2 Merge "disallow changing from multi-sim to single-sim for carrier apps" 2019-03-06 19:10:58 +00:00
Andrei-Valentin Onea
734611e34e Merge "Add @UnsupportedAppUsage annotations"
am: f304f4d2ea

Change-Id: Ic5e5148c473e64bc5d8ff506e7f4ac78c409734c
2019-03-06 10:30:15 -08:00
Andrei-Valentin Onea
f304f4d2ea Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 18:01:47 +00:00
Andrei-Valentin Onea
20ebeb61a9 Merge "Add @UnsupportedAppUsage annotations"
am: 842e3aa420

Change-Id: Ie3bc96e663223de383be59cb764f139f459c5a67
2019-03-06 09:46:00 -08:00
Andrei-Valentin Onea
a25b4e8c07 Merge "Add @UnsupportedAppUsage annotations"
am: cf03906edc

Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239
2019-03-06 09:41:34 -08:00
Andrei-Valentin Onea
28eb381cae Merge "Add @UnsupportedAppUsage annotations"
am: 8cbc2e9ad1

Change-Id: I83a19c3b85546749e360ef979e8e6eeac09e29ea
2019-03-06 09:37:26 -08:00
Andrei-Valentin Onea
842e3aa420 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:19:05 +00:00
Andrei-Valentin Onea
cf03906edc Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:18:05 +00:00
Steven Moreland
0ff061a607 NativeHandle.java: set Nullable/NonNull
Fixes: 126700972
Test: hidl_test_java
Test: atest android.os.cts.HwBinderTest
Change-Id: Id45c6d0757913014028f7629db78b64f27cad084
2019-03-06 17:17:30 +00:00
Andrei-Valentin Onea
8cbc2e9ad1 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:17:27 +00:00
Felipe Leme
b662614ca6 Added secondary owners on per-file entries.
Test: none
Bug: 126945732

Change-Id: I4b9786c9b01993f230f962a54e08127684b3289e
2019-03-06 09:10:42 -08:00
Andrei Onea
890db3d672 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
2019-03-06 15:43:49 +00:00
Adrian Roos
cec0f35fcc Merge "apilint: Lint unhidden @IntDef and @LongDef"
am: 4435924104

Change-Id: I7d12ed9f2ac7fcdc6490a7fcd2e5c99a21fe7110
2019-03-06 04:57:33 -08:00
Adrian Roos
4435924104 Merge "apilint: Lint unhidden @IntDef and @LongDef" 2019-03-06 12:43:55 +00:00
Adrian Roos
3478239c56 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
2019-03-06 13:40:03 +01:00
Sundong Ahn
27ea7c09d3 Merge "Add permission and permission.xsd"
am: e5d100518d

Change-Id: I2bfa1ae166ac8cba7a2668f69a355203b41e2570
2019-03-06 03:57:49 -08:00
Treehugger Robot
e5d100518d Merge "Add permission and permission.xsd" 2019-03-06 11:49:03 +00:00
Sundong Ahn
da9ebd5a17 Merge "Add default-permissions"
am: d05e13d0a4

Change-Id: If359ee759e26b7b065060768db9f591d856f213b
2019-03-06 02:16:36 -08:00
Sundong Ahn
d05e13d0a4 Merge "Add default-permissions" 2019-03-06 10:04:12 +00:00
Wei Sheng Shih
8230f428e4 Merge "Revert "API tweaks""
am: c61bb461b6

Change-Id: I8b9729b9afe1798b84193a4ce09777372585fc27
2019-03-06 01:44:14 -08:00
Wei Sheng Shih
c61bb461b6 Merge "Revert "API tweaks"" 2019-03-06 09:32:11 +00:00