444628 Commits

Author SHA1 Message Date
Artur Satayev
db23306e83 Export change id processor.
- Don't declare the plugin directly, it is exported via java_library that defines the sources.
- Remove unneeded framework-annotation-proc.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Ie750b5391229d21679a8610780b9f8d4a997e204
Merged-In: Ie750b5391229d21679a8610780b9f8d4a997e204
2020-03-27 22:44:30 +00:00
Tom Cherry
f87fe63af1 Merge "Remove ANDROID_LOG_RDONLY" 2020-03-24 21:00:57 +00:00
Yan Yan
a6d47fba4a Merge "Include HexDump in framework-ike-shared-srcs" 2020-03-24 17:30:24 +00:00
Treehugger Robot
7820030367 Merge "Allow staging multiple session with non-overlapping packages (apk-only)" 2020-03-24 16:53:39 +00:00
Tom Cherry
013bd1623f Remove ANDROID_LOG_RDONLY
This macro hasn't been meaningful in years.

Test: logging unit tests
Merged-In: I1b5008dd468e8ce0280a1e3e8c106e34c9648695
Change-Id: I1b5008dd468e8ce0280a1e3e8c106e34c9648695
2020-03-24 09:14:36 -07:00
Treehugger Robot
abe9621f7f Merge "Add a log message if enabling Ethernet tethering if it is already enabled." 2020-03-24 14:54:44 +00:00
Lorenzo Colitti
2688e9f238 Add a log message if enabling Ethernet tethering if it is already enabled.
Test: builds
Bug: 150644681
Change-Id: I68123e6dd04ccae5da2ecd7526c11d9f835d1d57
2020-03-24 13:28:53 +00:00
Treehugger Robot
31145f453b Merge changes Idf2c9bd8,Iec48362f
* changes:
  Remove unnecessary art.module.api.annotations
  Remove dependency on dalvik.annotation.compat.VersionCodes
2020-03-24 11:31:33 +00:00
Orion Hodson
7f26443fac Merge "Add UnixChannelFactory to preloaded-classes" 2020-03-24 09:04:53 +00:00
Treehugger Robot
c9bacc92e8 Merge "Fix addRoute replace default route unexpectedly" 2020-03-24 05:51:30 +00:00
junyulai
4fe1889b52 Fix addRoute replace default route unexpectedly
In aosp/1203789, if two routes are with the same destination,
it will be replaced instead of added when calling addRoute.
This breaks scenarios which rely on the ability to add multiple
default routes, such as multiple IPv6 default routes learned
via address autoconfiguration.

This change treats the route is an update if the destination
and nexthop are the same, but different in other properties.

Test: atest OffloadControllerTest#testSetUpstreamLinkPropertiesWorking
Test: atest LinkPropertiesUtilsTest#testLinkPropertiesIdenticalEqual
Test: atest ConnectivityServiceTest#testStackedLinkProperties
Test: atest ConnectivityServiceTest#testRouteAddDeleteUpdate
  (only directly related tests are listed)
Fix: 152170074
Fix: 151911339
Bug: 142892223

Change-Id: I7153ec9866f14a109ba8155c905e5d9e4f85eb64
2020-03-24 10:27:01 +08:00
Treehugger Robot
6982a7dc69 Merge "Fix idmap2 uninitialized variables" 2020-03-24 01:47:12 +00:00
Ryan Mitchell
a7b7de59e0 Fix idmap2 uninitialized variables
Some primitives were not initialized to a default value causing
--ignore-overlayable and --verbose to default to true.

Bug: 148181123
Test: idmap2_tests
Change-Id: If87ba76b7d24803f46b71ef36befa12f25916680
Merged-In: Ic9dbd3e9a768beb39ac677ff294b0fca5ee8f9d2
2020-03-24 01:02:38 +00:00
Sarah Chin
48b63e04f6 Merge "SubscriptionPlan: remove getNetworkTypesBitMask" 2020-03-23 22:14:31 +00:00
Sarah Chin
3782fad894 Merge "Fix NPE in updateNrState" 2020-03-23 22:14:12 +00:00
Xiangyu/Malcolm Chen
074af36692 Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." 2020-03-23 21:31:35 +00:00
Paul Duffin
c58441f56a Remove unnecessary art.module.api.annotations
Test: m droid
Change-Id: Idf2c9bd8b1cd1cfc573cf84cb1c3a1f8afc07f4b
2020-03-23 21:06:02 +00:00
Paul Duffin
8fca45318d Remove dependency on dalvik.annotation.compat.VersionCodes
Allows removal of dependency on art.module.api.annotations.

(cherry picked from 5dc3088cc1e311fae2e28a48d2fd060919d3f0e7)

Test: m droid
Merged-In: Ib0632a3eccfed73d66a51afc0ad6aa50c0311501
Change-Id: Iec48362f2eb643b80f900b974393e23b692e7d1c
2020-03-23 21:01:26 +00:00
Hunter Knepshield
b2a7f082e4 Merge "Forward IBinder#dump to CarrierService#dump" 2020-03-23 20:21:13 +00:00
Brad Ebinger
0fd00037ea Merge "API Review: Clarify deprecated docs and rethrow from system server" 2020-03-23 20:17:41 +00:00
satayev
cce5cd451a Merge "Remove unsupportedappusage_index.csv from droidcore target." 2020-03-23 19:42:25 +00:00
Hunter Knepshield
dcd87bf35c Forward IBinder#dump to CarrierService#dump
This will allow CarrierConfigLoader to dump packages' bound carrier
services as part of bug reports when appropriate.

Bug: 146521742
Test: manual with modified CarrierConfigLoader + dumpsys carrier_config
Change-Id: Ie3aef4216e7a42e5e4cc5ba4a3978b9c4dda50dd
Merged-In: Ie3aef4216e7a42e5e4cc5ba4a3978b9c4dda50dd
(cherry picked from commit 05a57b6f5ee0e7538cd6c2fc8b94cd9f67b63f95)
2020-03-23 11:01:35 -07:00
Brad Ebinger
06d11782d7 Merge "API Review: Make ImsReasonInfo in ImsMmTelManager @NonNull" 2020-03-23 17:18:26 +00:00
Brad Ebinger
2a15872d99 Merge "API fix: getProprietaryCallExtras should not return null" 2020-03-23 17:10:13 +00:00
Brad Ebinger
ee30a546d6 Merge "API fix: Rename and clarify ProvisioningManager constants" 2020-03-23 16:19:36 +00:00
Brad Ebinger
3d46c07f77 Merge "API Review: Rethrow from system server for ImsCallSessionListener" 2020-03-23 16:18:18 +00:00
Brad Ebinger
a8ea082246 Merge "API Review: Define the extras as containing CharSequences, not Strings" 2020-03-23 16:17:21 +00:00
Treehugger Robot
bd085080f7 Merge "Framework did not notifyDisplayInfoChanged" 2020-03-23 16:05:47 +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
Tobias Thierer
6e6a18e8bf Merge "Refactor Network's use of mUrlConnectionFactory." 2020-03-23 11:34:43 +00:00
Tobias Thierer
eb461e2090 Refactor Network's use of mUrlConnectionFactory.
1.) Replace maybeInitUrlConnectionFactory() with a static method
    createUrlConnectionFactory(Dns) and move the logic to acquire
    the lock and initialize mUrlConnectionFactory out into
    openConnection. This makes it a bit clearer that the lock
    is acquired during openConnection().
2.) Use @GuardedBy("mLock") rather than a human readable comment
    on mUrlConnectionFactory.
3.) Make mUrlConnectionFactory non-volatile (since it's guarded by
    mLock), as recommended by Narayan on the review thread for
    http://r.android.com/370652
    Alternatively, the field could have remained volatile
    and we could have used double-checked locking to avoid
    acquiring the lock in the common case.
    The lock is only acquired during getSocketFactory() and
    openConnection(), so it shouldn't usually be contended.

This CL is a pure refactoring that shouldn't have any observable
behavior change.

Bug: 38311512
Test: Treehugger
Exempt-From-Owner-Approval: refactoring only, owner didn't respond in time
Change-Id: I1cf6075dc7cd994657b11d6a82de3ec63235fb1e
2020-03-23 11:34:32 +00:00
SongFerngWang
c8fd146744 Framework did not notifyDisplayInfoChanged
Bug: 150648297
Test: adb shell am broadcast -a com.android.internal.telephony.TestServiceState \
--ei data_rat 14 --ei nr_state 3 --ei nr_frequency_range 4

Merged-In: I151833df7652b58d4bd599938e84b88e112cc0d7
Change-Id: Ie881d8bc86fa4b6c64ec34b5a9bef29cc686b5bb
2020-03-23 10:01:53 +00:00
Junyu Lai
0d8b1cfa6d Merge "Address API council review comment about TetheringRequest" 2020-03-23 09:32:57 +00:00
Neil Fuller
d68e501ff1 Merge "Tweak command-line verb names" 2020-03-23 08:52:52 +00:00
Remi NGUYEN VAN
57d570c8d4 Merge "Fix javadoc for Context.TETHERING_SERVICE" 2020-03-23 07:53:19 +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
junyulai
9e69c26a6d Address API council review comment about TetheringRequest
Test: atest TetheringTests FrameworksNetTests NetworkStackTests
Bug: 152055812
Change-Id: I0158d88e364772f9ac258bd18955edcdad266ad8
Merged-In: I0158d88e364772f9ac258bd18955edcdad266ad8
(this is a clean cherry-pick from ag/10796412)

Change-Id: I64f1527d79085cc5dfd78c01a6c49c4df87c82e7
2020-03-23 14:14:22 +08:00
Remi NGUYEN VAN
d4373f3a54 Merge "Add a test API for testing NetworkStack.getService" 2020-03-23 05:46:38 +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
a24a9f710e Add a test API for testing NetworkStack.getService
NetworkStack.getService was introduced to avoid relying on
Context#getSystemService to obtain the NetworkStack binder token.
To allow it to be mocked in tests, a method is introduced to allow tests
to specify a mock NetworkStack token for their own process.

Test: atest NetworkStackTests, using the change
Bug: 151243982
(clean cherry-pick from internal branch)
Merged-In: I04058a007f2dfe1044cabeb3ac508404873665ad

Change-Id: I0e626d871176112a8575d629a05cb7a935b577a6
2020-03-23 03:25:51 +00:00
Remi NGUYEN VAN
d49a77f6e6 Remove usage of Context.NETWORK_STACK_SERVICE
The NetworkStack.getService() API should be used instead.

Bug: 151243982
Test: atest FrameworksNetTests TetheringTests
      Manual tethering test
Merged-In: I7855090bffbe895c8349ad4903b8f2eb55515f0b
(clean cherry-pick from internal branch)

Change-Id: If4af2846a82605e828287a9a4680d5547b76b802
2020-03-23 11:29:06 +09: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
Treehugger Robot
c1cae420a2 Merge "Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth SystemApis and for hidden connect/disconnect APIs." 2020-03-22 08:30:56 +00:00
Philip P. Moltmann
2a9c3e49ba Merge "Pipe through attributeTag for one SMS permission check" 2020-03-21 05:18:24 +00:00
Rahul Sabnis
8bc55739e7 Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth SystemApis and for hidden connect/disconnect APIs.
Hide some APIs that were previously marked as @UnsupportedAppUsage and re-add annotation as changing the permissions for these SystemApis would break the unsupported app contract that was previously there. Therefore, we're choosing to hide them until we have a good story on how to deal with them next release.

Bug: 148689314
Test: Manual
Merged-In: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a
Change-Id: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a
2020-03-21 04:14:29 +00:00
Treehugger Robot
905d2c24cc Merge "Fix regression on voice call default volume" 2020-03-21 01:22:55 +00:00
Sarah Chin
bf421a9826 Fix NPE in updateNrState
Test: build
Bug: 151837748
Change-Id: Ia05cb6b43a79524501821467c510f595f7a64ebe
Merged-In: Ia05cb6b43a79524501821467c510f595f7a64ebe
2020-03-20 16:57:59 -07:00
Brad Ebinger
51aa63a61d API Review: Make ImsReasonInfo in ImsMmTelManager @NonNull
1) If the vendor does not specify an ImsReasonInfo, create an
unspecified ImsReasonInfo instead of passing null back.
2) Move onUnregistered to @NonNull

Fixes: 150008589
Test: atest CtsTelephonyTestCases:ImsServiceTest
Merged-In: Idd0f2216bdd55011cb16d268b61cb652ca11bd41
Change-Id: Idd0f2216bdd55011cb16d268b61cb652ca11bd41
2020-03-20 16:49:41 -07:00
Meng Wang
ba66f0f761 SubscriptionPlan: remove getNetworkTypesBitMask
To avoid using hidden API TelephonyManager#getBitMaskForNetworkType

Bug: 140908357
Test: make
Change-Id: Ibb04fd43117d4b7cf9f768e6ccf9a8f605a2f5e8
Merged-In: Ibb04fd43117d4b7cf9f768e6ccf9a8f605a2f5e8
2020-03-20 16:37:57 -07:00
Brad Ebinger
3253b5421f API Review: Rethrow from system server for ImsCallSessionListener
Test: atest FrameworksTelephonyTests:ImsCallSessionListenerTests
Bug: 149997618
Fixes: 151172994
Merged-In: I98e7aeb033c3a5da332cc40e58ec5e066be6a2cc
Change-Id: I98e7aeb033c3a5da332cc40e58ec5e066be6a2cc
2020-03-20 16:28:41 -07:00