Commit Graph

1431 Commits

Author SHA1 Message Date
Hall Liu
60905c039b Merge "API tweaks" am: f3fbbeaa05 am: 4c3e0ccfa5
am: fe12d8de3f

Change-Id: I13342f7735adb24240c4ca34245f93e3d7579d78
2019-03-06 17:17:16 -08: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
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
Andrei-Valentin Onea
20ebeb61a9 Merge "Add @UnsupportedAppUsage annotations"
am: 842e3aa420

Change-Id: Ie3bc96e663223de383be59cb764f139f459c5a67
2019-03-06 09:46:00 -08:00
Andrei-Valentin Onea
842e3aa420 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:19:05 +00:00
Wei Sheng Shih
9ec61a3214 Merge "Revert "API tweaks"" am: c61bb461b6 am: 8230f428e4
am: fdc3dc5670

Change-Id: I53aba1bcac7bc5aabba152dcb9f6510befba4f69
2019-03-06 02:02:49 -08: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
Wei Sheng Shih
6042fca3f2 Revert "API tweaks"
This reverts commit f3e0eb8b0c.

Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered

Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
2019-03-06 09:15:17 +00:00
Hall Liu
0ff1a805bb Merge "API tweaks" am: 13152049e9 am: cc8f17b2dd
am: aa1483ec38

Change-Id: Id177c76677cbe3c8b0ef6b9a0fcc235ca223c069
2019-03-05 17:49:31 -08:00
Hall Liu
cc8f17b2dd Merge "API tweaks"
am: 13152049e9

Change-Id: I7339a8e77cea9bea236977f8a5df39c28feadaa5
2019-03-05 15:54:02 -08:00
Hall Liu
13152049e9 Merge "API tweaks" 2019-03-05 21:18:40 +00:00
Hall Liu
f3e0eb8b0c 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
2019-03-04 17:29:52 -08:00
Tyler Gunn
e694ef523b 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
2019-03-04 08:28:22 -08:00
Slava Shklyaev
e65e401305 Revert "Revert "Revert "Revert "Correct nullability and final constraints on new APIs.""""
This reverts commit 2fac9dd3d4.

Reason for revert: the change being reverted was not supposed to be
merged into git_master.

Change-Id: Ieb9169fdd242edb72774e5c3d5824bc54b55cc05
2019-03-04 16:14:29 +00:00
Slava Shklyaev
ae68d85fc3 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" am: 0bbf61f024 am: 08bc717117
am: 5317912537

Change-Id: Idab2d4174aa3d6a19f9573edf0d5ee3ecfa33201
2019-03-04 07:17:43 -08:00
Slava Shklyaev
0bbf61f024 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" 2019-03-04 14:42:17 +00:00
Slava Shklyaev
2fac9dd3d4 Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""
This reverts commit b255be1307.

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
2019-03-04 14:39:56 +00:00
Slava Shklyaev
fc291d1ed1 Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" am: 86e2035208 am: 6ced2f195d
am: 8e6b20f4f3

Change-Id: I0aa41b4fc5d08201deffccdaa25c50ae7942fe78
2019-03-04 04:40:09 -08:00
Slava Shklyaev
86e2035208 Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" 2019-03-04 11:49:34 +00:00
Slava Shklyaev
b255be1307 Revert "Revert "Correct nullability and final constraints on new APIs.""
This reverts commit 8462c66bd5.

Reason for revert: Looks like this change broke the build.

Change-Id: I4cff1ec1211e278d5e5734f1594c096722293662
2019-03-04 11:47:11 +00:00
Tyler Gunn
55ae1a1bd2 Merge "Revert "Correct nullability and final constraints on new APIs."" am: 049867e364 am: 80379f24ec
am: 7b0b6677c2

Change-Id: I5c38019d99e6258002fb5017fdf88733b7d1ffe7
2019-03-03 22:06:40 -08:00
Tyler Gunn
049867e364 Merge "Revert "Correct nullability and final constraints on new APIs."" 2019-03-04 05:37:44 +00:00
Tyler Gunn
8462c66bd5 Revert "Correct nullability and final constraints on new APIs."
This reverts commit b6940c3ea6.

Reason for revert: There appears to be a downstream issue with how the test API definitions are created; until I can figure out how to account for this I'll revert in AOSP (this is in internal master and its fine there).

Change-Id: I840c3ed82afa18323408e161913a84858f7a1539
2019-03-04 05:19:42 +00:00
Tyler Gunn
cdbfa9d087 Merge "Correct nullability and final constraints on new APIs." 2019-03-04 04:13:38 +00:00
Tyler Gunn
3649374e17 Merge "Expose some APIs as test APIs to facilitate CTS" 2019-03-03 23:26:09 +00:00
Tyler Gunn
25ac5349fc Merge "Correct nullability and final constraints on new APIs." 2019-03-03 22:59:50 +00:00
Hall Liu
aa1eee77b3 Merge "API tweaks round 2" am: 3c0a49ec48 am: 87d1b7a83e
am: dfe5bcebd5

Change-Id: Ibec797ea98e43ef450fe6a095550c5c73c4f8604
2019-03-01 17:44:21 -08:00
Hall Liu
3c0a49ec48 Merge "API tweaks round 2" 2019-03-01 23:00:54 +00:00
Tyler Gunn
124f1f6dd5 Expose some APIs as test APIs to facilitate CTS
Test: added new cts tests
Bug: 123896388
Merged-In: I742f23be57e731307338591d816f7888e198b333
Change-Id: I742f23be57e731307338591d816f7888e198b333
2019-03-01 14:26:50 -08:00
Tyler Gunn
b6940c3ea6 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: Icec15403493de596194a61b27bb3e1031fdc1099
Merged-In: Icec15403493de596194a61b27bb3e1031fdc1099
2019-03-01 20:56:56 +00:00
Tyler Gunn
5c1a4e0bf3 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: Icec15403493de596194a61b27bb3e1031fdc1099
2019-03-01 12:53:14 -08:00
Jeff Sharkey
9e8f83db6d 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
2019-02-28 23:29:04 -07:00
Hall Liu
1059cd57f0 API tweaks round 2
Add nullability annotations and change a static constant to a method
that returns a value.

Fixes: 126702861
Fixes: 126699926
Fixes: 126698717
Fixes: 126699057
Fixes: 126701443
Fixes: 126700882
Test: compiles
Change-Id: I96396eb8890b8b5148cf74447e08c31983398e47
2019-02-28 18:54:15 -08:00
Shi Yuanjie
2c5a80140b Merge "Fix to hide phone number printed in the log" am: b967dce9d9 am: ae023634bf
am: 28ebdcb28c

Change-Id: I0c8c324477e46db6dfd6bc770d7154decb0d6276
2019-02-28 17:30:57 -08:00
Treehugger Robot
b967dce9d9 Merge "Fix to hide phone number printed in the log" 2019-03-01 00:45:51 +00:00
Andrei Onea
cf1a82953b Add @UnsupportedAppUsage annotations
For packages:
  com.android.internal.app
  com.android.internal.appwidget
  com.android.internal.location
  com.android.internal.os
  com.android.internal.policy
  com.android.internal.statusbar
  com.android.internal.telecom
  com.android.internal.telephony
  com.android.internal.widget

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: I6eba34467b2492047e5264684312adfa029eb317
Change-Id: I413c4b6dd12bcf40b69423718ed278cbefe82087
2019-02-28 17:01:29 +00:00
Andrei Onea
fa152f9517 Add @UnsupportedAppUsage annotations
For packages:
  com.android.internal.app
  com.android.internal.appwidget
  com.android.internal.location
  com.android.internal.os
  com.android.internal.policy
  com.android.internal.statusbar
  com.android.internal.telecom
  com.android.internal.telephony
  com.android.internal.widget

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
Change-Id: I6eba34467b2492047e5264684312adfa029eb317
2019-02-27 16:42:54 +00:00
Tyler Gunn
016982ae2f Merge "Change data types on CallIdentification API." 2019-02-22 21:13:28 +00:00
Tyler Gunn
b3bdb7c36c Change data types on CallIdentification API.
Per API council feedback update the call identification name, details,
description and app name to use CharSequence.

Test: Update apis, run tests.
Bug: 123241094
Merged-In: I42df17506535c1dd598ffd61a44cb0d0440b8159
Change-Id: I42df17506535c1dd598ffd61a44cb0d0440b8159
2019-02-22 11:18:05 -08:00
Tyler Gunn
d490ce1483 Merge "Change data types on CallIdentification API." 2019-02-22 15:21:44 +00:00
Xin Li
4ba3b12efb Merge changes from topic "PPRL.190205.001"
* changes:
  Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
  DO NOT MERGE - Merge PPRL.190205.001 into master
2019-02-20 16:25:58 +00:00
Tyler Gunn
befee0b6dd Merge "Add support for Telecom logging to obfuscate string phone numbers." am: ae941732bb am: bfd852a7bb
am: 600db05fb1

Change-Id: If249e9ac6f579856de3e3790eb2844ca93c7e5d2
2019-02-19 21:16:32 -08:00
Tyler Gunn
bfd852a7bb Merge "Add support for Telecom logging to obfuscate string phone numbers."
am: ae941732bb

Change-Id: I3ca1652cfd23ad3f94991c21e5072d4082cc20c8
2019-02-19 20:57:50 -08:00
Tyler Gunn
ae941732bb Merge "Add support for Telecom logging to obfuscate string phone numbers." 2019-02-20 04:40:13 +00:00
Tyler Gunn
b483055581 Change data types on CallIdentification API.
Per API council feedback update the call identification name, details,
description and app name to use CharSequence.

Test: Update apis, run tests.
Bug: 123241094
Change-Id: I42df17506535c1dd598ffd61a44cb0d0440b8159
2019-02-15 16:04:13 -08:00
Shuo Qian
b75330904e Merge "Populate 'hasKnownUserIntentEmergency'"
am: 59d8275546

Change-Id: If7167ecae8c4de2cfb3a8032beb350fe1e327f32
2019-02-15 13:43:51 -08:00
Shi Lu
2e31d35a35 Merge "API Review: SIP INVITE fields on a MT call" 2019-02-15 21:01:25 +00:00
Xin Li
0e71b4f19b DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
stage-aosp-master

Bug: 124234733
Change-Id: Ic4f67fde0835da0b1c363906cccef0d244e38393
2019-02-14 09:48:06 -08:00