Commit Graph

22848 Commits

Author SHA1 Message Date
Mady Mellor
b091bc9431 Merge "BubbleMetadata flags: suppress initial notif & auto expand when posted" 2019-01-25 17:26:38 +00:00
TreeHugger Robot
3abecb462b Merge "Rename PERSON_USER_LOCAL and PERSON_USER_REMOTE" 2019-01-25 17:16:38 +00:00
Dario Freni
5cccc2bd8e Merge "Add an error message to staged install session." 2019-01-25 14:21:56 +00:00
TreeHugger Robot
471530dd56 Merge "Remove MediaController2 usages in MediaSessionServiceImpl" 2019-01-25 14:21:24 +00:00
Tony Mak
91daa15eea Rename PERSON_USER_LOCAL and PERSON_USER_REMOTE
Test: atest TextClassificationManagerTest.java
Bug: 123223181

Change-Id: I077d06aabf96d824942b99dd6ab95fe8adc2641f
2019-01-25 12:07:50 +00:00
Dario Freni
275b4aba77 Add an error message to staged install session.
The enum itself might be a bit opaque when trying to debug what failed
during the staged session flow. Add an error message field so that the
caller can learn more about the failure, and also log this message on
logcat.

Bug: 118865310
Bug: 123360647
Test: atest PackageInstallerSessionTest; verified that error message is
written to install_sessions.xml and in logcat.

Change-Id: I45c8633f36d490c17c751a9037b90d3fd413c506
2019-01-25 10:02:44 +00:00
Hyundo Moon
c1e4316e02 Remove MediaController2 usages in MediaSessionServiceImpl
Bug: 123336670
Test: Passed below tests
      MediaSessionManagerTest#testNotifySession2Created/Destroyed*
Change-Id: I25a20bf9e8a78920f2219d22b81b899af665ed32
2019-01-25 18:52:44 +09:00
TreeHugger Robot
3175839d6c Merge "Add PermissionControllerManager.isApplicationQualifiedForRole()." 2019-01-25 05:55:41 +00:00
Jeff Sharkey
85d9b31a13 Merge "Verify permissions are only held by media stack." 2019-01-25 04:20:27 +00:00
Hai Zhang
1982187691 Add PermissionControllerManager.isApplicationQualifiedForRole().
Settings DefaultAppShortcutPreference needs this info to determine
whether to show the shortcut to default apps on the app info page.

Bug: 110557011
Bug: 123238935
Test: manual
Change-Id: I3ffa62eb199ba9c761bf09a556443f685f6b6b50
2019-01-24 17:38:36 -08:00
TreeHugger Robot
0969d6ec11 Merge "Unhide APIs of Android HDMI Framework for Q." 2019-01-25 00:45:37 +00:00
Jeff Sharkey
334ddaa544 Merge "Define DeviceConfig for storage features." 2019-01-25 00:19:16 +00:00
Jeff Sharkey
87a5616161 Verify permissions are only held by media stack.
The WRITE_MEDIA_STORAGE permission is a very powerful permission that
grants raw storage access to all devices, and as such it's only
appropriate to be granted to the media stack. Any apps with a
user-visible component (such as Camera or Gallery apps) must go
through public MediaStore APIs, to ensure that users have meaningful
permission controls.

For example, if the end user revokes the "Music" permission from an
app, but that app still has raw access to music via
WRITE_MEDIA_STORAGE, that would be a privacy incident.

Bug: 118402224
Test: atest android.permission.cts.ProviderPermissionTest
Change-Id: Iaf649689ff9e6d4eabbdb242852c179500654b56
2019-01-24 17:17:46 -07:00
Mady Mellor
0157ff27e2 BubbleMetadata flags: suppress initial notif & auto expand when posted
Test: atest NotificationTest
Bug: 111236845
Change-Id: Idd1d23a91f2bf45454d1598637c8d7979b7f5287
2019-01-24 15:49:21 -08:00
Dan Albert
fa4f594144 Merge "resolve merge conflicts of fb54fde402 to master" 2019-01-24 23:00:19 +00:00
Etan Cohen
448a1d5c2a Merge "[WIFI][LOCATION] Convert API from Coarse -> Fine for >= Q" 2019-01-24 22:49:12 +00:00
Dan Albert
fe1cdd047f resolve merge conflicts of fb54fde402 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
2019-01-24 14:46:02 -08:00
Dan Albert
fb54fde402 Merge "Revert "Whitelist packages from VPN lockdown."" am: 9f73671651
am: 2f94ef95c4

Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
2019-01-24 13:58:15 -08:00
Zak Cohen
d8e2cc5308 Merge "Add documentation for ContentSuggestionsManager classes." 2019-01-24 21:48:59 +00:00
TreeHugger Robot
147cfc3a9c Merge "Update EuiccManager APIs used for eSIM activation flow" 2019-01-24 21:35:47 +00:00
Jeff Sharkey
5d0c55c0d9 Define DeviceConfig for storage features.
Best-practices mean that we should start using this path for remote
configuration, instead of Settings.Global values.

Bug: 112545973
Test: manual
Change-Id: Ic6f1e9eca28690a212baeb52bd119717c3f495a4
2019-01-24 14:32:33 -07:00
Zak Cohen
b399c842dc Add documentation for ContentSuggestionsManager classes.
Bug: 122545621
Change-Id: I449cd71a438410c4cd4796f99af0653750329654
Test: compile, documentation only change
2019-01-24 13:23:15 -08:00
TreeHugger Robot
9a6f30ee6d Merge "Add g/setScore and g/setEntityTypes to TextClassifierEvent" 2019-01-24 21:23:13 +00:00
Christine Franks
0ae3740d43 Merge "Make night display auto mode system API" 2019-01-24 21:22:19 +00:00
Dan Albert
9f73671651 Merge "Revert "Whitelist packages from VPN lockdown."" 2019-01-24 21:08:46 +00:00
Amy
9444cdd8ea Unhide APIs of Android HDMI Framework for Q.
Test: manual
Bug: 110094868
Change-Id: I4f8d992a1dc7be7e52710153d5d093ca2b82abd6
2019-01-24 13:08:19 -08:00
Dan Albert
ee8e6a0fae Revert "Whitelist packages from VPN lockdown."
This reverts commit bb9cef04c5.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
2019-01-24 21:05:39 +00:00
Philip P. Moltmann
a0f377fbe8 Merge "Set assistant as a role" 2019-01-24 20:51:41 +00:00
TreeHugger Robot
748dfe2b1b Merge "Make getLocalTextClassifier public" 2019-01-24 20:24:10 +00:00
TreeHugger Robot
356227b0f6 Merge "Add back @NonNull to DevicePolicyManager.wipeData" 2019-01-24 20:19:22 +00:00
Brad Ebinger
fcaf4a2492 Merge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 3fc958475b am: 1e6ed3c5eb
am: 270fe0a1f9

Change-Id: Id9c04847789ac612b6de7ddea15292936a6f24c8
2019-01-24 11:45:19 -08:00
Brad Ebinger
d18b780145 Define a subset of provisioning integers as public am: ad9aec3522 am: 7b353e207e
am: 3d7a116e85

Change-Id: I93d88ffc45a8edd3abc9a281322eaedab8a86dc1
2019-01-24 11:38:35 -08:00
Ugo Yu
d02a78bd95 Merge "Introduce system APIs for Bluetooth silence mode." am: d17b284bdb am: 5a5217d2b8
am: 26b4283a13

Change-Id: I07f8019e748495b05ea09bab69ec72c0ab9f271b
2019-01-24 11:21:36 -08:00
Brad Ebinger
270fe0a1f9 Merge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 3fc958475b
am: 1e6ed3c5eb

Change-Id: Ib16f22466459b5a294cfab5d020f64aad11cecfc
2019-01-24 10:58:53 -08:00
Brad Ebinger
3d7a116e85 Define a subset of provisioning integers as public am: ad9aec3522
am: 7b353e207e

Change-Id: I55969aca6c0f948dc911eac8c587e322f8da6901
2019-01-24 10:53:29 -08:00
Ugo Yu
26b4283a13 Merge "Introduce system APIs for Bluetooth silence mode." am: d17b284bdb
am: 5a5217d2b8

Change-Id: Icdc5720da633f3cba7e1acb730b4ca21475d6f4b
2019-01-24 10:37:47 -08:00
Brad Ebinger
7b353e207e Define a subset of provisioning integers as public
am: ad9aec3522

Change-Id: I89c0b4242b68f545cce6043341150d45d4e22643
2019-01-24 10:35:59 -08:00
Irina Dumitrescu
b866a5b6e6 Merge "Add API for proxy configuration over VPN." am: 8b5917965d
am: ac77629a1e

Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
2019-01-24 10:20:32 -08:00
Brad Ebinger
3fc958475b Merge changes from topics "ut_provision_api", "ims_prov_api_defs"
* changes:
  Add new UT provisioning CarrierConfig options
  Define a subset of provisioning integers as public
2019-01-24 18:09:14 +00:00
Treehugger Robot
d17b284bdb Merge "Introduce system APIs for Bluetooth silence mode." 2019-01-24 18:08:05 +00:00
Pavel Grafov
52e0e403d2 Merge "Whitelist packages from VPN lockdown." am: efc773525c
am: 295016b22b

Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
2019-01-24 10:06:37 -08:00
Treehugger Robot
8b5917965d Merge "Add API for proxy configuration over VPN." 2019-01-24 17:52:22 +00:00
Pavel Grafov
efc773525c Merge "Whitelist packages from VPN lockdown." 2019-01-24 17:34:55 +00:00
Mingguang Xu
c18eb1c3ef Merge changes from topic "wifi_api_to_receive_score"
* changes:
  Wifi usability: Add new entry into wifi.proto for metrics collection
  Wifi usability: Add @SystemApi to receive Wifi usability score
2019-01-24 16:33:49 +00:00
Jeff Sharkey
f1a4991dcc Merge "Migrate CTS to separate broadcast to scan volume." 2019-01-24 16:25:57 +00:00
Ben Murdoch
754454718e Merge "Migrate AppCompaction settings to DeviceConfig APIs." 2019-01-24 16:19:13 +00:00
Pavel Grafov
bb9cef04c5 Whitelist packages from VPN lockdown.
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
2019-01-24 16:17:11 +00:00
Pavel Grafov
46165b5d61 Merge "Whitelist packages from VPN lockdown." 2019-01-24 16:15:08 +00:00
Irina Dumitrescu
044a436ac9 Add API for proxy configuration over VPN.
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Merged-In: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
2019-01-24 16:07:20 +00:00
Tony Mak
03a1d0338d Add g/setScore and g/setEntityTypes to TextClassifierEvent
1. Add get/setScore, so we can see how do scores affect the CTR and
eventually tune the threshold based on it.

2. Convert get/setEntity to get/setEntityTypes.
   Some events like TYPE_ACTIONS_GENERATED and TYPE_ACTIONS_SHOWN
   will need to have a list of entity types. Also, as TRON does not
   support a field of list type. And thus workaround this by having
   3 separate fields in TRON.

4. The result id of action is too easy to clash now as only messages
   are taking into account. Use timestamp and the person object as
   the input to the hash now.

5. Changes in TRON:
   a) We will put conversation_action / language detection, etc to
      category. And we will put the views to subtype.
   b) As suggested by the TRON team, we should not reuse existing fields
   in the clients directly. But we should rather introduce new fields,
   and map them to existing fields in the server. So, TRON team could
   suppress just the new logging if it goes wrong and not affect
   existing loggings.

Test: atest TextClassifierEventTest.java
Tests: atest TextClassifierEventTronLoggerTest.java

BUG: 120803809

Change-Id: I2e71436b323a200beec57ea7c1a8bcc96c9c552f
2019-01-24 15:12:00 +00:00