Commit Graph

29076 Commits

Author SHA1 Message Date
Mehdi Alizadeh
7a2b81b7d3 Merge "Adds locus Id to ShortcutQuery to find shortcuts based on LocusId" 2020-02-06 02:50:38 +00:00
Etan Cohen
e5455e171b Merge changes from topic "wificond"
* changes:
  [WIFICOND][API] Replace capability BitSet by an int
  [WIFICOND][API] Update documentation
  [WIFICOND][API] Simplify initialization sequence
  [WIFICOND][API] Documentation clarification for AP callback registration
  [WIFICOND][API] Clarify time usage
2020-02-06 02:15:19 +00:00
TreeHugger Robot
d51f8c5639 Merge "Move compat behavior in #onPipRequested to ActivityThread" 2020-02-06 02:00:57 +00:00
Howard Ro
18108f0a82 Merge "Create REGISTER_STATS_PULL_ATOM permission" 2020-02-06 01:45:23 +00:00
Muhammad Qureshi
a1e47e9f2b Create REGISTER_STATS_PULL_ATOM permission
Create a permission to allow clients to register pull atom callbacks to
statsd. This permission should allow mainline modules and other platform
clients register puller callbacks, but is not intended for 3p apps.

Bug: 146462168
Test: atest CtsPermission2TestCases
Change-Id: Iea50d137e2cc9f34644c8aa9548a7445f5ec16b8
2020-02-05 14:42:15 -08:00
Etan Cohen
e8d73bb397 [WIFICOND][API] Replace capability BitSet by an int
The capability bit set is standard constrained - 16 bits and no more.
Can use a simpler/lighter int.

Per API council feedback.

Bug: 148680192
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: I47e8458d64f998da2e9743ad850687bc56a24cf6
2020-02-05 14:14:17 -08:00
Mehdi Alizadeh
ae808ff765 Adds locus Id to ShortcutQuery to find shortcuts based on LocusId
Bug: 148085173
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10
Test: atest DataManagerTest

Change-Id: Ie789582a43db6d53130f4a0e5bff646a3c08c71e
2020-02-05 13:53:47 -08:00
Automerger Merge Worker
a6b0017b8f Merge "TvProvider API standardization for ATSC3.0 and DVB" am: 19f99b96eb am: 513b456663 am: 18f8b709f3
Change-Id: I19dd1a6fcfed99138d86883d1576538bcd266b13
2020-02-05 21:49:55 +00:00
Automerger Merge Worker
513b456663 Merge "TvProvider API standardization for ATSC3.0 and DVB" am: 19f99b96eb
Change-Id: Ic859063c1dacbad5152b5210fae0c410219e77bc
2020-02-05 21:23:12 +00:00
Eugene Susla
695cfc2057 Merge "Introduce permission flag for whitelisting permission from auto-revoke" 2020-02-05 21:10:47 +00:00
nchalko
19f99b96eb Merge "TvProvider API standardization for ATSC3.0 and DVB" 2020-02-05 21:09:42 +00:00
Automerger Merge Worker
3f01e13713 Merge changes from topics "cbs_area_info", "subscription_id" am: 361cae3630
Change-Id: I95de805e4f8decbba7ab5f18278d97a13d064eb9
2020-02-05 19:19:33 +00:00
Automerger Merge Worker
8a6bd20bdb Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a
Change-Id: I3c5f995f742ea861140e22ab43ff40d89ab462ad
2020-02-05 19:19:27 +00:00
Jack Yu
361cae3630 Merge changes from topics "cbs_area_info", "subscription_id"
* changes:
  Added area info support in cell broadcast service
  Renamed SUB_ID to SUBSCRIPTION_ID
2020-02-05 19:13:54 +00:00
David Su
41bb9862d8 Merge "WifiConfiguration: unmark apBand as @SystemApi" 2020-02-05 18:24:01 +00:00
Etan Cohen
97ba3da295 [WIFICOND][API] Simplify initialization sequence
Per API council request: rename 'initialize' to the only function
it (really) executed - setting up a death listener.

Bug: 148680192
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: I0857f1b550f6bdae039dae76b663bc2813dc5bdb
2020-02-05 09:52:07 -08:00
Etan Cohen
d098b4f7b2 [WIFICOND][API] Clarify time usage
- Use long for time
- Add annotations

Per API council feedback.

Bug: 148680192
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Ib32640a864b8f4d7674348c1eb8bbd6d4f17ab32
2020-02-05 09:52:07 -08:00
Nadav Bar
37fe5fa718 Merge "AudioRecordingCofiguration#getClientUid - Throw SecurityException if client is missing permision" 2020-02-05 17:08:23 +00:00
Tony Mak
4624cdd12e Merge "Make TCS.getDefaultTextClassifierImplementation returns a ... SystemTextClassifier that is backed by ExtServices" 2020-02-05 14:44:39 +00:00
Julia Reynolds
e79019393a Merge "Separate concept of VIC from DND" 2020-02-05 12:21:25 +00:00
Automerger Merge Worker
630aacdc73 Merge "Remove System APIs not required for R" am: f5f137b9d3
Change-Id: I02925dc4f4810032a7381832187c420253227664
2020-02-05 12:04:38 +00:00
Automerger Merge Worker
5b9370b4c8 Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi" am: 12aeaefeaf
Change-Id: I8d9025a1419bdfff854eb44f92ab9afe009edddc
2020-02-05 12:04:08 +00:00
Neil Fuller
f5f137b9d3 Merge "Remove System APIs not required for R" 2020-02-05 11:56:20 +00:00
Aaron Huang
12aeaefeaf Merge "Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi" 2020-02-05 11:48:26 +00:00
Neil Fuller
1b883e2118 Merge "Remove System APIs not required for R" 2020-02-05 11:47:13 +00:00
Yuhan Zhao
be5015b00a Merge "Intercepting activites that could cause lock task mode violation in ActivityStartInterceptor." 2020-02-05 07:42:49 +00:00
Svetoslav Ganov
3e2213e035 Merge "Providing new accessibilityNode action" 2020-02-05 03:45:32 +00:00
Automerger Merge Worker
e7217d3eee Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 am: cd3f28071e am: 9514b54cfd
Change-Id: I648f6be33a3b9ec4626fc991863df4645629d2a2
2020-02-05 01:14:26 +00:00
Jack Yu
d588c33c71 Added area info support in cell broadcast service
Added a broadcast for area info changed event, and
also a get method in cell broadcast service to
retrieve the area info.

Test: Cell broadcast sanity tests
Bug: 141318859

Merged-In: I5995e3c5099a1e49cb0c54d33da1dbfcc94d4037
Change-Id: I5995e3c5099a1e49cb0c54d33da1dbfcc94d4037
(cherry picked from commit afaa71d418)
2020-02-04 17:03:01 -08:00
Automerger Merge Worker
cd3f28071e Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61
Change-Id: I3a222fe93c7cc4bfc0b967e51b633ceb0605c642
2020-02-05 00:50:59 +00:00
David Su
fd5cbd6523 WifiConfiguration: unmark apBand as @SystemApi
SoftApConfiguration is the new official API for
storing Soft AP configurations. Thus, remove
@SystemApi for WifiConfiguration#apBand.

Bug: 148424108
Bug: 146046526
Test: compiles
Change-Id: I39d2a664ac336998322b63a64e174d6802b1ac54
2020-02-04 16:43:15 -08:00
Rahul Sabnis
6d4004fc61 Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" 2020-02-05 00:41:33 +00:00
Nate Jiang
1b74411bc3 Merge "Make autojoin consistent" 2020-02-05 00:36:39 +00:00
Jack Yu
087568092a Renamed SUB_ID to SUBSCRIPTION_ID
In order to be consistent with other existing APIs.

Test: Build
Bug: 146563563

Merged-In: Iac8d9abe3b011485ffe8220d94f25f99d022014b
Change-Id: Iac8d9abe3b011485ffe8220d94f25f99d022014b
(cherry picked from commit e94a7a4f97)
2020-02-04 16:20:44 -08:00
TreeHugger Robot
e9a69b5667 Merge "Deprecates ChooserTargetService APIs" 2020-02-04 23:10:13 +00:00
Yuhan Zhao
f3b3d41560 Intercepting activites that could cause lock task mode violation in ActivityStartInterceptor.
Test: Manual
Test: atest WmTests:ActivityRecordTests
Test: atest WmTests:ActivityStartInterceptorTest
Test: atest WmTests:LockTaskControllerTest
Bug: b/131614258
Screenshot: https://screenshot.googleplex.com/hPy1b9NgkNj
Change-Id: Ibba62d4cd0065cab9c46fcb575c207d1a88bd02f
2020-02-04 14:38:39 -08:00
Automerger Merge Worker
6461a7e81c Merge "Add public API for EuiccService log dump" am: f22d8eac6f
Change-Id: I1dc34f7a657a522826f0a8ed02ae726d9306150e
2020-02-04 22:30:23 +00:00
Rahul Sabnis
99507b5eb3 Change data type of duration param from int representing seconds to long
representing milliseconds in BluetoothAdapter#setScanMode

Bug: 144380530
Test: Manual
Change-Id: I76528478a64d22afefd4ec964d1a78295dd3c94f
2020-02-04 14:29:09 -08:00
Alex Lin
f22d8eac6f Merge "Add public API for EuiccService log dump" 2020-02-04 22:26:53 +00:00
Etan Cohen
b9a3ea2f80 Merge changes from topic "wificond"
* changes:
  [WIFICOND][API] Update channel API from array to list
  [WIFICOND][API] Expose public constructor for data classes.
2020-02-04 22:13:48 +00:00
Automerger Merge Worker
e1f9b607d7 Merge "Added data coding scheme and location check time support" am: ad194f332d
Change-Id: I475683bca98d019295726a21a487253ae09383a7
2020-02-04 21:55:33 +00:00
Winson Chung
3d358dba3d Merge "Add lock task check when entering split screen" 2020-02-04 21:39:36 +00:00
jorgegil@google.com
b8ee18f002 Move compat behavior in #onPipRequested to ActivityThread
Removes the pause-hint-resume cycle to trigger PiP out of the
default implementation of #onPictureInPictureRequested and replaces
it with a bool check in its caller in ActivityThread.
This prevents exposing the pause/resume cycle to the public API.

Bug: 148011369
Test: atest FrameworksCoreTests:android.app.activity.ActivityThreadTest
Test: atest CtsWindowManagerDeviceTestCases:PinnedStackTests
Test: atest WmTests:ActivityTaskManagerServiceTests
Change-Id: Iec4f602ccf411a31f0cee5a4599cf2fea6f25994
2020-02-04 13:38:25 -08:00
Amy Zhang
f816b93b97 Merge "Make TvInputManager.getClientPid(int) to hidden api" 2020-02-04 21:29:14 +00:00
Neil Fuller
4222b7bec8 Remove System APIs not required for R
Test: treehugger
Bug: 148842434
Merged-In: If022a726a058a90cb5446d220628c76800da8e96
Change-Id: If022a726a058a90cb5446d220628c76800da8e96
2020-02-04 21:21:34 +00:00
Tony Mak
c5a7432ebf Make TCS.getDefaultTextClassifierImplementation returns a ...
SystemTextClassifier that is backed by ExtServices

1. The default textclassifier is always provided by
   config_servicesExtensionPackage (i.e. ExtServices)
2. OEM can specify a system text classifier by specifying
   config_defaultTextClassifierPackage.
3. System text classifiers can get an instance of the default textclassifier
   by calling TCS.getDefaultTextClassifierImplementation(), so that
   they can add their customization on top of the default TCS.
4. If config_systemTextClassifierPackage is set, the specified package
    is used to process requests from apps and the platform. Otherwise,
   the default textclassifier is used.
5. For testing and droidfooding purpose, text classifier service package
   can be overridden. If the overridden package is neither
   the default one nor the system one, the package is considered as a
   untrusted text classifier, which can only see requests from itself.

Test: m mts && mts-tradefed run mts-extservices
Test: Not setting config_defaultTextClassifierPackage. Select some text and
      make sure smart selection works. Run dumpsys textclassification
      to make sure the default TCS is bound.
Test: Setting config_defaultTextClassifierPackage and repeat the above.
      Make sure the specified OEM text classifier is used.
Test: Set the service override config to be ExtServices.
      Run dumpsys textclassification to make sure everything is unbound.
      Select some text and make sure ExtServices is bound.
Test: Set the service override to be AiAi and repeat the above.
Test: Set the service to be something invalid and repeat the above.
      Observe that no TC is bound and fallback to NO_OP.

BUG: 148049185

Change-Id: Ia2fb549fda49363e0d0ebc4b7e0d31cb76e11ee0
Make TCS.getDefaultTextClassifierImplementation returns a ...
SystemTextClassifier that is backed by ExtServices

1. The default textclassifier is always provided by
   config_servicesExtensionPackage (i.e. ExtServices)
2. OEM can specify a system text classifier by specifying
   config_defaultTextClassifierPackage.
3. System text classifiers can get an instance of the default textclassifier
   by calling TCS.getDefaultTextClassifierImplementation(), so that
   they can add their customization on top of the default TCS.
4. If config_systemTextClassifierPackage is set, the specified package
    is used to process requests from apps and the platform. Otherwise,
   the default textclassifier is used.
5. For testing and droidfooding purpose, text classifier service package
   can be overridden. If the overridden package is neither
   the default one nor the system one, the package is considered as a
   untrusted text classifier, which can only see requests from itself.

Test: m mts && mts-tradefed run mts-extservices
Test: Not setting config_defaultTextClassifierPackage. Select some text and
      make sure smart selection works. Run dumpsys textclassification
      to make sure the default TCS is bound.
Test: Setting config_defaultTextClassifierPackage and repeat the above.
      Make sure the specified OEM text classifier is used.
Test: Set the service override config to be ExtServices.
      Run dumpsys textclassification to make sure everything is unbound.
      Select some text and make sure ExtServices is bound.
Test: Set the service override to be AiAi and repeat the above.
Test: Set the service to be something invalid and repeat the above.
      Observe that no TC is bound and fallback to NO_OP.

BUG: 148049185

Change-Id: Ia2fb549fda49363e0d0ebc4b7e0d31cb76e11ee0
2020-02-04 20:36:52 +00:00
Julia Reynolds
24edc00304 Separate concept of VIC from DND
(Very important conversations). Track VICs in a different
field, and update DND (and public apis) to allow
all, important, or no conversations through.

Test: atest, cts
Bug: 137397357

Change-Id: Iae04546eb7c0b1e79cfdbeec7311628cd7ad634a
2020-02-04 14:23:46 -05:00
David Su
6d5c892936 Merge "Rename WifiManager.ACTION_WIFI_SCAN_AVAILABLE" 2020-02-04 19:06:14 +00:00
Neil Fuller
567a91279f Remove System APIs not required for R
Test: treehugger
Bug: 148842434
Change-Id: If022a726a058a90cb5446d220628c76800da8e96
2020-02-04 18:59:23 +00:00
Eugene Susla
7794d109cc Introduce permission flag for whitelisting permission from auto-revoke
This will be the flag set for granted permissions when we want to exempt
it from automatic revocation.

Test: lint/presubmit
Bug: 146513245
Change-Id: I21b6ecb62726643de635d0d5197f7f889a2ab87a
2020-02-04 10:56:24 -08:00