Commit Graph

655037 Commits

Author SHA1 Message Date
Treehugger Robot
db5da1ce28 Merge "Replace object tag with img tag in javadoc" 2021-11-09 09:55:36 +00:00
Riddle Hsu
c2cd376f6f Merge "Fix flakiness of testTransferLaunchCookie" 2021-11-09 07:47:35 +00:00
Treehugger Robot
8ce39879cf Merge "Update owners file" 2021-11-09 07:44:38 +00:00
Riddle Hsu
6cdf0bbec7 Fix flakiness of testTransferLaunchCookie
The count down latch is triggered too early that the value
to be verified may not have been set.

Fixes: 194183975
Test: atest ActivityOptionsTest#testTransferLaunchCookie
Change-Id: I3b78db921a178e2df970a85496ae5238b5bd6fb3
(cherry picked from commit c10eb7b18d)
2021-11-09 14:21:28 +08:00
Sooraj Sasindran
79c8a3cff4 Update owners file
add sasindran
rm nazaninb

Bug: 199432252
Test: build
Merged-In: I2f537aaf1faec1dce65a3041da8b13e15ed96057
Change-Id: I2f537aaf1faec1dce65a3041da8b13e15ed96057
2021-11-08 22:02:15 -08:00
Sudheer Shanka
8aebd244de Merge "Add documentation for BlobStore service." 2021-11-08 21:57:35 +00:00
Treehugger Robot
e9c20518f7 Merge "Add OWNERS for the health package (servicestests)." 2021-11-08 16:13:57 +00:00
Yi Kong
473d29e6b1 Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" 2021-11-08 11:11:07 +00:00
Wei Sheng Shih
385935d07f Merge "setTurnScreenOn can only used as wakeup" 2021-11-08 07:07:27 +00:00
Yi Kong
b324a7418a Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD
The new name better aligns with the component and permission names.

Follow up review comments on https://r.android.com/1784487

Bug: 183487233
Test: presubmit
Change-Id: Ibe3a3e51b0dc154ee3e43b27e561fd541b62cc54
2021-11-08 06:16:22 +00:00
wilsonshih
5ffa690f0c setTurnScreenOn can only used as wakeup
setTurnScreenOn shouldn't dismiss keyguard automatically even when the
keyguard is insecure.
The keyguard state should only be affected by requestDismissKeyguard
and/or setShowWhenLocked, and for either case setTurnScreenOn can be
used to wakeup device if the activity is going to be resumed and
visible.

Bug: 201103497
Test: atest ActivityVisibilityTests KeyguardTests KeyguardLockedTests
Change-Id: I283dea469a33286fc9cf835e39ee5a3be2444739
2021-11-08 11:04:10 +08:00
Yi Kong
0849b35051 Merge "profcollect/betterbug integration with content uri" 2021-11-06 08:17:18 +00:00
Yifan Hong
06d8d3de90 Add OWNERS for the health package (servicestests).
Test: pass
Bug: 177269435
Change-Id: I71bceb1bb6d1797cdc744ae939b0d4e694a7c8e6
2021-11-05 23:49:08 -07:00
Treehugger Robot
bcafa9a7b1 Merge "Refactored DataProfile and ApnSetting" 2021-11-06 05:22:17 +00:00
Les Lee
a1e47b652b Merge "Fix normalize doesn't work on carrier template" 2021-11-06 00:54:14 +00:00
Jack Yu
fc2b851d9d Refactored DataProfile and ApnSetting
Merged traffic descriptor into DataProfile. Now DataProfile
becomes a container of an ApnSetting plus a TrafficDescriptor.

Bug: 196597630
Test: CTS && atest FrameworksTelephonyTests
Merged-In: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
Change-Id: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
(cherry picked from commit bbb1110998)
2021-11-05 17:16:13 -07:00
Nathan Harold
9aca73a930 Merge "Add GERAN to Docstring for PhysicalChannelConfig" 2021-11-05 23:49:40 +00:00
Treehugger Robot
99da93a0e7 Merge "Add the min aspect ratio to ActivityRecordProto and populate it" 2021-11-05 18:06:29 +00:00
Bernardo Rufino
f5cc73d25f Merge "Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()" 2021-11-05 17:43:00 +00:00
Roopa Sattiraju
30cd5df67f Merge "Change getEnabledComponentOverrides return type" 2021-11-05 17:33:00 +00:00
Trevor Radcliffe
eaebd2cd54 Merge "Migrate rs/jni to Soong" 2021-11-05 16:10:56 +00:00
Bernardo Rufino
41d4be0fef Merge "Improve @hide Parcel.hasFileDescriptors(Object)" 2021-11-05 14:51:18 +00:00
tomnatan
61836d5b5a Add the min aspect ratio to ActivityRecordProto and populate it
This is needed for CompatChangeTests to verify that the min aspect ratio
is applied directly by checking the min aspect ratio.

Bug: 203541827
Test: N/A
Change-Id: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
Merged-In: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
2021-11-05 11:29:51 +00:00
Rahul Sabnis
eb806924d6 Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." 2021-11-05 05:13:01 +00:00
Rahul Sabnis
8e78d9fbf3 Deprecate GATT callbacks and methods that were not memory safe and
replace with memory safe versions.

Tag: #feature
Bug: 195157393
Test: Manual
CTS-Coverage-Bug: 205190062
Merged-In: I5ae604ec20febcf646bfe6a8f866b218448349c1
Change-Id: I5ae604ec20febcf646bfe6a8f866b218448349c1
2021-11-05 03:30:03 +00:00
Nathan Harold
b175697953 Add GERAN to Docstring for PhysicalChannelConfig
Bug: 8675309
Test: none (docstring-only-change)
Change-Id: I2d96980b1d2fcc665b63d126ae2ebb63e649a574
2021-11-05 02:06:24 +00:00
Treehugger Robot
3494086c36 Merge "Protect new LE Audio Broadcasts" 2021-11-04 18:43:36 +00:00
Rambo Wang
aac94b26a7 Merge "Clear up ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED logic" 2021-11-04 18:15:50 +00:00
Steven Moreland
a83307fbd8 Merge "Binder: correction of javadoc formatting" 2021-11-04 17:33:56 +00:00
Trevor Radcliffe
c2968df46b Migrate rs/jni to Soong
Fixes: 203674447
Test: Treehugger
Change-Id: I30054bc293b5a6870abb0c1f1c3919f250372b0a
2021-11-04 14:44:07 +00:00
Santiago Seifert
88aed3b81d Merge "Replace new with sp<>::make" 2021-11-04 10:21:35 +00:00
Les Lee
f9520f6d7d Fix normalize doesn't work on carrier template
From android 12, the subscriberId is being used for different network
types. For instances:
The TYPE_WIFI with subscriberId means that it is a merged wifi network.
The TYPE_CARRIER means that the network associate to specific carrier
network (subscriberId).

So remove the check "isMatchRuleMobile" and only check whether subscriberId
is being used in NetworkTemplate or not.

Bug: 194939211
Test: atest -c NetworkTemplateTest
Change-Id: I80c9f887cf8b4714716d657da92ed273a532ce27
2021-11-04 14:12:09 +08:00
Hai Zhang
bff35de778 Merge "Unify owners for default permission grant policy." 2021-11-04 00:44:08 +00:00
Sudheer Shanka
055cbb2089 Add documentation for BlobStore service.
Bug: 191168800
Test: n/a
Change-Id: Id55d593856d6194cd620211cc3bca981e572d15a
Merged-In: Id55d593856d6194cd620211cc3bca981e572d15a
2021-11-03 23:05:18 +00:00
Rambo Wang
14cc15dc37 Clear up ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED logic
The feature is now replaced with TM#setSignalStrengthUpdateRequest
introduced in S release. The logic for the obsoleted feature is
cleared up.

The request to report system signal strength while idle is
still protected by permission to use internally.

Bug: 177924721
Test: atest TelephonyRegistryTest SignalStrengthUpdateRequestTest
Change-Id: Idad4ca59720fac50b5ec0fe50e2b6ac8e9dbb801
2021-11-03 11:39:17 -07:00
Brett Chabot
a90cb087c0 Merge changes from topic "cp_slim"
* changes:
  Lazy load Properties::isDrawingEnabled.
  Backport 'add config to disable snapshots'.
  Backport 'Add ability to disable GL draws'.
2021-11-03 18:00:49 +00:00
Bill Yi
982bb0f145 Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Jing Ji
7e76d37fdb Merge "Explicitly exit from the am instrument after test completes" 2021-11-03 17:07:30 +00:00
Treehugger Robot
ec9a8515d7 Merge "remove AudioManager.setParameters from bluetooth" 2021-11-03 17:00:22 +00:00
Santiago Seifert
05f95dcaa7 Replace new with sp<>::make
As per sp's recommendations.

Bug: 204401299
Change-Id: Ida464b7ef44e2ad5855764e4e7d03b9f6bd5d1b0
Test: Built and flashed device.
Test: atest CtsMediaTestCases:MediaPlayerTest
2021-11-03 12:12:11 +00:00
Dima
0d9bb37a9a Binder: correction of javadoc formatting
Fixed javadoc formatting, namely references to methods that were typoed and displayed incorrectly in Android Studio.

Change-Id: I190eab35bc7ec6e162cb6d614b2c74523ff86c1c
2021-11-03 08:10:04 +00:00
Bill Yi
ba584f1fa1 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516
2021-11-02 21:07:53 -07:00
Hai Zhang
7ea5048947 Unify owners for default permission grant policy.
The list of owners is taken from:
- frameworks/base/services/core/java/com/android/server/pm/permission/OWNERS
- cts/common/device-side/util-axt/src/com/android/compatibility/common/util/OWNERS
- vendor/xts/gts-tests/tests/permission/src/com/google/android/permission/gts/OWNERS

Test: presubmit
Change-Id: I3cc073d4890a4295caba8b04752a02f1e00db03c
2021-11-03 03:41:45 +00:00
Lucas Lin
74ef57b885 Merge "Set underlying network of VCN" 2021-11-03 00:44:40 +00:00
Yifan Hong
d69e2b3f13 Merge "Revert "libandroid_runtime_vm_headers is recovery_available."" 2021-11-02 17:39:06 +00:00
William Escande
ef429b62b1 remove AudioManager.setParameters from bluetooth
All uses of AudioManager.setParameters are a hack that we have to remove.

Bug: 196440888
Tag: #refactor
Test: Build
Change-Id: I6deeffef8fbd8ba1c501f41c74b4763503106cc0
2021-11-02 16:38:15 +01:00
Bernardo Rufino
7c296d7514 Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()
After aosp/1878338, I realized Bundle.hasFileDescriptors() was accessing
mParcelledData and mMap without a lock. So, to avoid locking
there, I made mParcelledData volatile (since after mParcelledData is
null, it can never be non-null again and mMap is guaranteed to be
non-null). So, moved assignments to mParcelledData to be last wrt mMap
and mParcelledByNative to ensure visibility of those fields.

While refactoring copyInternal(), realized that method was always used
after constructing an uninitialized Bundle, so to avoid mistakes with
objects not properly initialized, I created a constructor in Bundle,
PersistableBundle & BaseBundle that does that copyInternal() did.

Bug: 195622897
Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Change-Id: I5c9337496da7ecf87f10370726099dcb247a6789
2021-11-02 11:42:11 +00:00
Bernardo Rufino
31d70842e0 Improve @hide Parcel.hasFileDescriptors(Object)
Addressing Jeff's comment on aosp/1787847 to support List<> in
Parcel.hasFileDescriptor(), also added support for Map (+ArrayMap) and
Object[] that were missing. Made the checks recursive since it's
possible to put nested containers in bundle. Since that's @hide and only
used by bundle, included Parcel as a supported type too and clarified in
the javadoc.

That allowed to clean up Bundle.hasFileDescriptors().

Bug: 195622897
Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Change-Id: I6acf358763d8f544fc6ff1a5b0c8bdff567d50be
2021-11-02 10:54:58 +00:00
Mohammad Islam
e583e6d676 Merge "Propagate classpath info for staged apex to PackageManager" 2021-11-02 08:51:01 +00:00
Remi NGUYEN VAN
5318227f2a Merge "Add framework-annotations-lib to Wifi service deps" 2021-11-02 06:49:19 +00:00