Commit Graph

8332 Commits

Author SHA1 Message Date
Makoto Onuki
a11035a7eb Remove unnecessarily @System/TestApi annotations
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Exempt-From-Owner-Approval: Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
Change-Id: I36e3562b72e64b51e4febd1d42a3bc8e4dc60988
2020-06-24 20:49:20 +00:00
Charles Munger
e73a6a704e Deprecate public PackageManager constructor.
BUG=63112905

Change-Id: I0277737eb9e683073f27d2ddea30c93f78ec4b91
2020-06-08 17:37:31 +00:00
Andrew Sapperstein
23d5746e06 Fix broken @see tags in public documentation. am: 1f6e22cbd8
Change-Id: I04a78c9ba3770a4d651177aae697890094a52add
2020-05-05 21:12:04 +00:00
Andrew Sapperstein
1f6e22cbd8 Fix broken @see tags in public documentation.
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
2020-05-01 00:42:22 +00:00
Xin Li
ab1261dddc DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Change-Id: Iacdd23c38aef7ff04c5d289720318d41cbf18158
Merged-In: I9265f01ed2f6e4aca7728d278f06ceea5633dac5
2020-04-07 15:13:00 -07:00
Sarah Chin
5fe578fabd Merge "Remove Mainline APIs for MmsManger and TelephonyManager" am: f8bd172434
Change-Id: I4d20fb3768363a172752766ad6243e185e19a76a
2020-03-31 20:58:17 +00:00
Sarah Chin
5fe2615046 Remove Mainline APIs for MmsManger and TelephonyManager
Test: build
Bug: 144004293
Bug: 147611125
Change-Id: I44682d1f33eee02d1dcf57f4de8ce2df0a9b126d
Merged-In: I44682d1f33eee02d1dcf57f4de8ce2df0a9b126d
2020-03-31 12:47:46 -07:00
Amit Mahajan
0965ee9327 Update API documentation per api-council feedback. am: 69cf3f0f03
Change-Id: Idb7658b12171e8fdb8eb465cf224be7877bffa34
2020-03-30 20:05:00 +00:00
Amit Mahajan
1c87deaacf Remove @SystemApi from some constants for R.
These were exposed for telephony mainline. Will be revisited in S.

Test: basic sanity
Bug: 148171847
Bug: 148171388
Merged-in: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e
Change-Id: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e
(cherry picked from commit c55b01552e)
2020-03-27 17:38:33 -07:00
Aaron Huang
bc10b501d0 Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" am: acacd7190f
Change-Id: If81a8a6168237fa29be3d94645554ec6a739c555
2020-03-26 07:01:44 +00:00
Aaron Huang
acacd7190f Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" 2020-03-26 06:48:51 +00:00
Treehugger Robot
65421fe420 Merge "Allow staging multiple session with non-overlapping packages (apk-only)" am: 7820030367
Change-Id: I87f982d0297ff2a5a54c387e2ceab04abd8960f1
2020-03-24 16:58:58 +00:00
Aaron Huang
52e578700c Remove Context.NETWORK_POLICY_SERVICE from @SystemApi
Hide Context.NETWORK_POLICY_SERVICE as it has no usage.

Bug: 151266974
Test: make checkapi, build
Copy from ag/10796415
Change-Id: I0586a5ef22f76fa1407219b96cb246f162f02947
Merged-In: I0586a5ef22f76fa1407219b96cb246f162f02947
2020-03-24 10:52:42 +00:00
Mohammad Samiul Islam
ef3b56dbc7 Allow staging multiple session with non-overlapping packages (apk-only)
Bug: 141843321
Test: atest StagedInstallTest#testAllowNonOverlappingMultipleStagedInstall_BothSinglePackage_Apk
Test: atest StagedInstallTest#testFailOverlappingMultipleStagedInstall_BothSinglePackage_Apk
Test: atest StagedInstallTest#testFailOverlappingMultipleStagedInstall_BothSinglePackage_Apex
Test: atest StagedInstallTest#testAllowNonOverlappingMultipleStagedInstall_MultiPackageSinglePackage
Test: atest StagedInstallTest#testFailOverlappingMultipleStagedInstall_BothMultiPackage
Test: atest StagedInstallTest#testMultipleStagedInstall_ApkOnly
Test: atest RollbackManagerHostTest#testApkOnlyMultipleStagedRollback
Test: atest RollbackManagerHostTest#testApkOnlyMultipleStagedPartialRollback
Test: atest StagedInstallTest
Change-Id: Iad2e35b50fd22e207e3ad91b48a767827d8e8926
Merged-In: Iad2e35b50fd22e207e3ad91b48a767827d8e8926
2020-03-23 15:51:07 +00:00
Remi NGUYEN VAN
aabf397cee Merge "Fix javadoc for Context.TETHERING_SERVICE" am: 57d570c8d4
Change-Id: I5f131da46621f942c80b5740bb7bd7aabe52b4ff
2020-03-23 08:19:40 +00:00
Remi NGUYEN VAN
8c224bae1a Fix javadoc for Context.TETHERING_SERVICE
Users of the API receive a TetheringManager from getSystemService; they
do not call ServiceManager.getService.

Bug: 151243982
Test: m
(clean cherry-pick from internal branch)
Merged-In: If75f590da17f07ea9d65635065689d8f4e17b40f

Change-Id: I129ffa7abae1218bcf88ccb8ba074ec8ad50119b
2020-03-23 07:53:09 +00:00
Remi NGUYEN VAN
6fc7f6e394 Remove NETWORK_STACK_SERVICE constant am: 4fb0137726
Change-Id: I5bf4b96601324620bd4db2ae8f04a877627568be
2020-03-23 03:48:01 +00:00
Remi NGUYEN VAN
341fa568b9 Merge changes from topic "netstack_constant_cherrypick"
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
2020-03-23 03:33:58 +00:00
Remi NGUYEN VAN
4fb0137726 Remove NETWORK_STACK_SERVICE constant
Instead, have a dedicated method in android.net.NetworkStack allowing to
fetch the stable AIDL token for the service.

This avoids returning IBinder from getSystemService, as getSystemService
should generally return manager classes.

Test: atest FrameworksNetTests NetworkStackTests
Fixes: 151243982
Merged-In: I58a6e1f27aff052050197d1901f43a98d7aa1167
(clean cherry-pick from internal branch)

Change-Id: I75aba269595f3e315dd5e0693c878b2026e8e299
2020-03-23 11:28:56 +09:00
Xin Li
3f0bfe4608 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I62d3293f617f630d3d2a3d5f67b764bf272769bf
2020-03-19 10:10:35 -07:00
Amit Mahajan
0aa828ab5d Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" 2020-03-18 15:31:08 +00:00
Amit Mahajan
5a29b0447b Revert "Expose ACTION_USER_SWITCHED as system API"
This reverts commit ffe0cbe5ca.

Reason for revert: Not needed for now; will be redone in S.

Bug: 148180958
Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6
2020-03-18 00:19:53 +00:00
Automerger Merge Worker
954d735153 Merge "Make MmsManager public and @SystemService" am: 01574a30ea am: f6cdbeb470
Change-Id: I1e354ba0456d8826f72ac642d9fe7d8ce6393a01
2020-03-03 21:39:32 +00:00
Automerger Merge Worker
f6cdbeb470 Merge "Make MmsManager public and @SystemService" am: 01574a30ea
Change-Id: I6978fb1377f76308732fb241f04adcef82087b7f
2020-03-03 21:22:33 +00:00
Sarah Chin
01574a30ea Merge "Make MmsManager public and @SystemService" 2020-03-03 21:17:11 +00:00
Automerger Merge Worker
a1b17ae07e Merge "[API Review] Expose sendOrderedBroadcast" am: b0157c3ee3 am: f1124753ed
Change-Id: Ieda3a33090f627f882faecbadb0a29aee7790bf2
2020-03-02 22:09:34 +00:00
Automerger Merge Worker
f1124753ed Merge "[API Review] Expose sendOrderedBroadcast" am: b0157c3ee3
Change-Id: I686308c2af6e31a30c211d25adea416d556e5cd1
2020-03-02 21:59:55 +00:00
Peter Wang
b0157c3ee3 Merge "[API Review] Expose sendOrderedBroadcast" 2020-03-02 21:50:13 +00:00
Automerger Merge Worker
8c8a5f36f7 Merge "Add feature to disable slices" am: fa871a3642 am: 2b554fa9d4
Change-Id: Ic51761f37309369022b92c9643d7540557481776
2020-02-28 22:44:07 +00:00
Automerger Merge Worker
2b554fa9d4 Merge "Add feature to disable slices" am: fa871a3642
Change-Id: I7b64d2b937a0ebe183440c430514e821e1174faf
2020-02-28 22:33:36 +00:00
Abhijit Adsule
fa871a3642 Merge "Add feature to disable slices" 2020-02-28 22:13:01 +00:00
Peter Wang
3e227cdfc5 [API Review] Expose sendOrderedBroadcast
with appOp as String and options as Bundle

Bug: 139077993
Bug: 146423958
Test: Build
Change-Id: I5325e08d60016741139251813a5df9b42f2efc82
Merged-In: I5325e08d60016741139251813a5df9b42f2efc82
2020-02-27 14:45:23 -08:00
Automerger Merge Worker
7f51a8727e Move EXTRA_SERVICE_STATE from Intent to ServiceState. am: 3ee618bbf5 am: 4349d2d937
Change-Id: Ibb04c37d3b4002fd3ad37e715bc75f059159d7c5
2020-02-26 18:15:27 +00:00
Automerger Merge Worker
4349d2d937 Move EXTRA_SERVICE_STATE from Intent to ServiceState. am: 3ee618bbf5
Change-Id: Ia1452df2cd70deeee8bac0d71f108404ac292725
2020-02-26 18:04:05 +00:00
Amit Mahajan
3ee618bbf5 Move EXTRA_SERVICE_STATE from Intent to ServiceState.
This extra is not exposed and is not used by anyone as such.
Leaving it there for internal use/unsupported app usage.

Test: basic sanity
Bug: 140908357
Merged-in: I9fe6e904291affb1cd7b705212d47525b61a5679
Change-Id: I9fe6e904291affb1cd7b705212d47525b61a5679
(cherry picked from commit bb61b17cd9)
2020-02-25 12:28:02 -08:00
Automerger Merge Worker
5ed8da775b Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" am: 1803b40158 am: c648a4ebd0
Change-Id: I38693e4663c28d32d7eda63240ae7d921c0279ac
2020-02-23 04:13:40 +00:00
Automerger Merge Worker
c648a4ebd0 Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" am: 1803b40158
Change-Id: Ie9a1ae8d778d8843cdcb7dd678aa8acafcac159f
2020-02-23 04:02:38 +00:00
Amy
ec8c2df33b Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context
Test: manual
Bug: 147380513
Change-Id: Id026b59bcec4a1ead9aa7ba900e72ee074c7ef81
Merged-In: Ifedc4e6f120e711aadffdf715d8720e0b64fbe16
2020-02-21 23:33:38 +00:00
Automerger Merge Worker
175caee171 Merge "Add Vulkan dEQP level feature flag" am: 49fa6ba37f am: 1e8247d25d
Change-Id: I42b80371ff3ce09881dcc756e8cf283db97dc62b
2020-02-20 21:36:03 +00:00
Automerger Merge Worker
1e8247d25d Merge "Add Vulkan dEQP level feature flag" am: 49fa6ba37f
Change-Id: Ibbaf55fe2126371392674b8abe3ae3013486b599
2020-02-20 21:24:20 +00:00
Treehugger Robot
49fa6ba37f Merge "Add Vulkan dEQP level feature flag" 2020-02-20 21:06:20 +00:00
Automerger Merge Worker
a2c3c9fe10 Merge "Revert "Revert "[DexLoadReporter] Report classloader contexts di..."" am: 1ee3e70cf3 am: 2cef69cb5f
Change-Id: I6146cfbbd0a8214e476e50b359ce5474e6d5070c
2020-02-19 20:12:07 +00:00
Automerger Merge Worker
2cef69cb5f Merge "Revert "Revert "[DexLoadReporter] Report classloader contexts di..."" am: 1ee3e70cf3
Change-Id: I5645d6c8f666e2e29e753cad5f216f9d7ab335d2
2020-02-19 19:52:57 +00:00
Calin Juravle
1ee3e70cf3 Merge "Revert "Revert "[DexLoadReporter] Report classloader contexts di..."" 2020-02-19 19:38:35 +00:00
Calin Juravle
c78162f489 Revert "Revert "[DexLoadReporter] Report classloader contexts di..."
Original commit:
[DexLoadReporter] Report classloader contexts directly from classloader

At the moment classloader contexts are incorrectly computed in the
PackageManager for secondary dex files. There are two issues:

(1) The wrong computed classLoaderContext will be reported for a secondary
    dex file if it was loaded at the same time as a primary dex file
    - This is due to the continue statement that doesn't increment
      dexPathIndex
(2) If a secondary dex file was loaded with a shared library then that
    shared library info isn't passed through the dex load reporting
    infrastructure, and thus its classloader context is incorrectly computed
    in PackageManager.

In order to fix the issues described above & prevent further classloader
context computation divergences between the package manager and the
runtime, lets compute the classloader context in the runtime at dex load
time and report the expected classloader context directly to
DexLoadReporter (and thus the package manager).

Notes: This is mostly just a refactor (i.e. there are a lot of line
changes, but functionally speaking this set of CLs doesn't do much
except change where the classloader context is computed)

Addendum: The bugs described above could also be fixed by:
- changing DexLoadReporter to report information about shared libraries that
  the reported classloaders depend on to PackageManager
- Teach DexoptUtils.processContextForDexLoad about shared libraries
- Fix dexPathIndex calculation in DexManager

I opted for this set of changes instead because this reduces the
possibility of context computation divergence between the framework and the
runtime. Additionally it feels more "solid" that the classloader context
is now computed directly when a dex file is loaded, rather than the
context recreated later on in the PackageManager.

Test: atest com.android.server.pm.dex.DexManagerTests
Test: atest com.android.server.pm.PackageManagerServiceTest
Test: Install app depending on shared library & uses secondary dex
files; adb shell pm bg-dexopt-job; launch app and see odex file
successfully loaded (from smaps/no logcat errors)

Bug: 148494302
Exempt-From-Owner-Approval: This is a pure re-revert, previously owner approved.
Reason for revert: Re-land
Reverted Changes:
I295a6e99e:Revert "Fix shared libraries not being reported vi...
Ib58066e8f:Revert "[DexLoadReporter] Report classloader conte...

Change-Id: I8d1af791f93a3f8fa6eca78df50891cd2ebbb4a3
2020-02-19 19:37:05 +00:00
Alastair Donaldson
1c0b692a0e Add Vulkan dEQP level feature flag
This change adds a feature flag that specifies the date associated
with the Vulkan dEQP tests that a device claims to pass.

Bug: 136573508

Change-Id: I0cec29fe5f69f228faaa2298b7f5b65bcf988dba
Merged-In: I0cec29fe5f69f228faaa2298b7f5b65bcf988dba
2020-02-19 19:17:50 +00:00
Automerger Merge Worker
893bf3b7f5 Merge "Improve BaseBundle#kindofEquals" am: 42ab50d14b am: 1f82fbb4ac
Change-Id: I0dadb4269692a86cab1c66e1c69d9a95bfddd9a2
2020-02-19 00:53:38 +00:00
Automerger Merge Worker
1f82fbb4ac Merge "Improve BaseBundle#kindofEquals" am: 42ab50d14b
Change-Id: Ic5c2c5bcf979236c77344d0507d071bbb83f624e
2020-02-19 00:33:09 +00:00
Nicolas Geoffray
f96a5bf6a0 Merge "Revert "[DexLoadReporter] Report classloader contexts directly f..."" am: ae50e15d59 am: ea12868665
Change-Id: I4faaff1f5227b64028222c5824d70ac0356cf20f
2020-02-15 17:51:03 +00:00
Nicolas Geoffray
ea12868665 Merge "Revert "[DexLoadReporter] Report classloader contexts directly f..."" am: ae50e15d59
Change-Id: Icc45c40ce116ce54a915650ca6f6600b6db08e0e
2020-02-15 17:36:14 +00:00