Commit Graph

109158 Commits

Author SHA1 Message Date
TreeHugger Robot
104f3be5d9 Merge "Fix crash after destroyed" 2019-12-06 11:20:59 +00:00
Aaron Huang
df293c54ad Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0 am: 1abb8de060
am: d9b442b050

Change-Id: Iaf7fe6ba60048daecfde44c8348f68727b245d98
2019-12-06 03:19:38 -08:00
Aaron Huang
d9b442b050 Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0
am: 1abb8de060

Change-Id: Ib98dde2ae3b6cfee05e8d5536565ce72f6722e0b
2019-12-06 03:12:46 -08:00
Aaron Huang
8aed6e69f0 Merge "Add TrafficStats methods to public APIs" 2019-12-06 10:59:11 +00:00
Rahul Sabnis
18b3802b15 Merge "Make BluetoothUuid constants and some functions System Apis" am: f6ea5afa58 am: f9f689020c
am: 7232ba49c8

Change-Id: Ief860164e931a234ccc82417f645cee0d0be6235
2019-12-06 00:35:34 -08:00
Meng Wang
da2141d66a Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0 am: 484b1b87e0
am: d32f3a1db3

Change-Id: I63311ec4fecd388e595a864d94b3bbb4c1fe8b89
2019-12-06 00:32:55 -08:00
Rahul Sabnis
fb486c21d9 Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7 am: 12558824e4
am: c0efc04ea7

Change-Id: I9c3f6d5eedcb1197908c8a2cf208215a458cd25d
2019-12-06 00:32:21 -08:00
Meng Wang
5fce3f501b Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8 am: d973a4b22c
am: cb7a8f3245

Change-Id: I0cf190f6e9e46b99ff14ff5b93ee82008a374f13
2019-12-06 00:27:48 -08:00
Meng Wang
0bcd19acdb Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd58 am: cb0d068f28
am: 4f47555359

Change-Id: Iafa9facfbb0759916cd414b23da19f9a3c367a55
2019-12-06 00:25:55 -08:00
Aaron Huang
29667d2942 Add TrafficStats methods to public APIs
Add methods to public APIs for mainline support.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts

Change-Id: I21a9c0dbdc79b1f1041fc9e23c6a4e1e97ecde92
2019-12-06 16:19:40 +08:00
Peter Wang
5b0ee657e0 Merge "[Telephony Mainline] Refactored grantDefaultPermissionsToActiveLuiApp and revokeDefaultPermissionsFromLuiApps from PermissionManagerService to Permmission Manager" 2019-12-06 05:32:51 +00:00
TreeHugger Robot
14ec7e5938 Merge "StatsManager uses private object for synchronizing" 2019-12-06 04:01:35 +00:00
TreeHugger Robot
921b6080c9 Merge "Fix error handling in StatsEvent" 2019-12-06 03:31:13 +00:00
Tej Singh
2cf3ae3f06 StatsManager uses private object for synchronizing
StatsManager used to synchronize on "this", which is dangerous because
an app can get StatsManager and also sychronize on it, which would block
all calls. We now lock on a private final object.

Test: make
Bug: 144315658
Fixes: 144315658
Change-Id: Ia34b1c586b09a48b244cc16dba77fe54e81f62cf
2019-12-05 18:42:30 -08:00
Andrew Chant
0cb0315c9d Merge "Revert "Window with FLAG_NOT_FOCUSABLE cant be IME target."" 2019-12-06 02:22:45 +00:00
Muhammad Qureshi
d265088259 Fix error handling in StatsEvent
Bug: 143286399
Test: bit FrameworksCoreTests:android.util.StatsEventTest
Change-Id: I2159bf138a307e45c44102a8feb7a69d0c793843
2019-12-05 18:07:12 -08:00
TreeHugger Robot
cf87cafa19 Merge "Bug report handler app via Bug Report Shortcut" 2019-12-06 01:45:31 +00:00
Rahul Sabnis
7232ba49c8 Merge "Make BluetoothUuid constants and some functions System Apis" am: f6ea5afa58
am: f9f689020c

Change-Id: Ie4e80f2682d0a4d18e9ee3f57dd457d9bd0ff6ff
2019-12-05 17:41:34 -08:00
Treehugger Robot
f6ea5afa58 Merge "Make BluetoothUuid constants and some functions System Apis" 2019-12-06 01:23:39 +00:00
Meng Wang
d32f3a1db3 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0
am: 484b1b87e0

Change-Id: I681dcc688aa1e66706c99cfa401c8b89cb6367c3
2019-12-05 17:20:49 -08:00
Meng Wang
392f3db6b0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 2019-12-06 00:32:40 +00:00
Rahul Sabnis
c0efc04ea7 Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7
am: 12558824e4

Change-Id: I70c293538b2b993800e8a77da8491237d21b0f9c
2019-12-05 16:25:12 -08:00
Treehugger Robot
b3de542cf7 Merge "Refactor BluetoothHeadset APIs used by Settings" 2019-12-06 00:11:52 +00:00
Meng Wang
cb7a8f3245 Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8
am: d973a4b22c

Change-Id: Ia2765a05104303e4d15b4f55ca8433759031dacc
2019-12-05 15:55:27 -08:00
Meng Wang
037b717fe8 Merge "Move DataConnectionRealTimeInfo from telephony to core." 2019-12-05 23:43:06 +00:00
Meng Wang
4f47555359 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd58
am: cb0d068f28

Change-Id: If502b6af63c532f5c87b384096680f7435018874
2019-12-05 15:37:24 -08:00
Alex Lin
a1248d313c Merge "Add country blacklist support" 2019-12-05 23:37:04 +00:00
TreeHugger Robot
9bd71189b7 Merge "Check if the surface control is released before setting metadata on it" 2019-12-05 23:33:04 +00:00
Meng Wang
ddf215dd58 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 2019-12-05 23:23:51 +00:00
Songchun Fan
e63063585c Merge "[incremental] parcelable for incfs file descriptors" am: c8b066091e
am: c93841a265

Change-Id: Ie9469f0e7b380ceafb2773d124d5c4d42c942d89
2019-12-05 15:10:17 -08:00
TreeHugger Robot
ca07451b9e Merge "Prevent Insets side visibility change during animation" 2019-12-05 23:07:57 +00:00
Andrew Chant
17c896e69b Revert "Window with FLAG_NOT_FOCUSABLE cant be IME target."
This reverts commit 0ffa15ab5f.

Reason for revert: Checking treehugger to see if this fixes instagram
input handling.

Bug: 144619551
Change-Id: I606c651f7ec1ea8c26ecc92fc5e94994a480950b
2019-12-05 22:39:02 +00:00
TreeHugger Robot
57bb01c720 Merge "Set accessibility ID to window surface" 2019-12-05 22:22:58 +00:00
Jeff Sharkey
6697c2fe1c Merge changes from topic "matchz"
* changes:
  Add QUERY_ARG_RELATED_URI to aid media placement.
  Introduce QUERY_ARG_MATCH_* values for filtering.
2019-12-05 22:07:57 +00:00
Songchun Fan
c8b066091e Merge "[incremental] parcelable for incfs file descriptors" 2019-12-05 22:02:49 +00:00
Paul Chang
c40f578d02 Bug report handler app via Bug Report Shortcut
- Send intent (android.internal.intent.action.BUGREPORT_REQUESTED) to bug report handler app after pressing Bug Report Shortcut
- Add config "config_bugReportHandlerEnabled" to enable this feature
- Add config "config_defaultBugReportHandlerApp" to get the package of default bugreport handler app
- Add settings CUSTOM_BUGREPORT_HANDLER_APP to get the package of custom bugreport handler app
- Add settings CUSTOM_BUGREPORT_HANDLER_USER to get the user id of custom bugreport handler app

BUG:142921485
Test: After pressing Bug Report Shortcut in manual local test:
- the intent can be sent to bugreport handler app.
- the intent can be sent to Shell if the chosen and the default bugreport handler app can't handle it.
- the intent can be sent to system user profile's default bugreport handler app if the custom profile(like work profile) is removed.
Change-Id: Idc33b47f0cc65b90cbf648bda54a1d900fef007a
2019-12-06 05:52:09 +08:00
Meng Wang
62d2ff8b36 Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager
Because the constants are only used by TelephonyRegistryManager and
TelephonyRegistry.

Bug: 140908357
Test: make
Change-Id: I6933d1aa5b8dc35f136c8c4aed8572221ddfb755
2019-12-05 21:32:03 +00:00
Peter Wang
56dec3f134 [Telephony Mainline] Refactored grantDefaultPermissionsToActiveLuiApp
and revokeDefaultPermissionsFromLuiApps from PermissionManagerService to
Permmission Manager

Bug: 142019744
Test: Build
Change-Id: Ic39e1a66b650e7969242eb2116f342de488b1ca6
2019-12-05 13:23:02 -08:00
TreeHugger Robot
dd07c25872 Merge "Fixing window dump timing out on wallpaper service" 2019-12-05 21:15:42 +00:00
Songchun Fan
4e19d8fda3 Merge "[incremental/installation] new API to add file to session" 2019-12-05 20:56:03 +00:00
Songchun Fan
b7c6d8d861 Merge "[incremental] data loader manager interface" 2019-12-05 20:55:50 +00:00
Meng Wang
646dcbd0ed Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY
Replaced with SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX. Both are set
in Intent extras by SubscriptionManager#putPhoneIdAndSubIdExtra.

Bug: 140908357
Test: make
Change-Id: I54a65ef81acc68c34af6263e929634f15f05e494
2019-12-05 12:12:20 -08:00
David Su
76210c4275 Merge "AsyncChannel: Migrate Slog to Log to enable Jarjaring" 2019-12-05 18:22:03 +00:00
Alan Stokes
f25c755705 Merge "Add PackageManager#getInstallSourceInfo() to the API." 2019-12-05 15:57:02 +00:00
TreeHugger Robot
40067bbcd2 Merge "getWifiMacAddress: Enable for profile owner on org-owned device" 2019-12-05 15:02:19 +00:00
Neil Fuller
6d1e81ee34 Merge "Add suggestManualTimeZoneSuggestion to the client" am: 63d5f12489 am: 2447fe6f69
am: ee036c7535

Change-Id: Ia6481faf3520b01d5d1ee821362d6c739479b42c
2019-12-05 06:45:14 -08:00
Fabian Kozynski
1f6640123b Merge "New Controls API @hide" 2019-12-05 14:15:24 +00:00
Neil Fuller
ee036c7535 Merge "Add suggestManualTimeZoneSuggestion to the client" am: 63d5f12489
am: 2447fe6f69

Change-Id: I2ecb6991ee2fce6b4d79164f4fd7dd568042db4f
2019-12-05 06:09:31 -08:00
Neil Fuller
63d5f12489 Merge "Add suggestManualTimeZoneSuggestion to the client" 2019-12-05 13:51:34 +00:00
Anna Trostanetski
5ec4ac7d81 Merge "Add descriptions to compat changes." am: b38db5afe0 am: d54f52b9ea
am: 76ba40cc64

Change-Id: I970da1371374bb8893e833d4c8d7629613214888
2019-12-05 04:39:49 -08:00