Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
443,063 Commits 3 Branches 0 Tags
ce4e22638cffb5baa84ee474ced294b0ae0eebf8
Commit Graph

443063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
ce4e22638c Merge "Add setSubscriptionOverride() to system API" am: f734372173 
Change-Id: I80a7cae65eaefad94afa428c27c84338142bd224
 2020-02-04 07:19:54 +00:00
Chalard Jean
f734372173 Merge "Add setSubscriptionOverride() to system API" 2020-02-04 07:07:57 +00:00
Automerger Merge Worker
6f87ad9abd Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" am: 442a1ca027 
Change-Id: I2b518c3bc87d2ae3db242227532c5306522e0ab7
 2020-02-04 02:55:32 +00:00
Betty Chang
442a1ca027 Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" 2020-02-04 02:44:15 +00:00
Automerger Merge Worker
d6e6068ded Merge "Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing." am: 602faa961a 
Change-Id: Ic76f1ffd8ec2b954e9a2ebb6c326662a8d3ace0d
 2020-02-04 00:02:14 +00:00
Treehugger Robot
602faa961a Merge "Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing." 2020-02-03 23:50:29 +00:00
Automerger Merge Worker
d7ab8fec8c Merge changes I446a8595,I68d2293f am: 29044acc20 
Change-Id: I8422163249ca637ab71b71777feded76e3225c2e
 2020-02-03 22:34:25 +00:00
Automerger Merge Worker
a2cf5100f0 Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" am: 9bf0c496df 
Change-Id: Iadcd9db4717f1350621ce1565c1f79b75af5eced
 2020-02-03 22:32:03 +00:00
Automerger Merge Worker
407f4c5c47 Merge "RecordingActivityMonitor: remove spam from death events" am: 91d0f80387 
Change-Id: I9c6279268eedf816e780c33a2e36521ef448ac94
 2020-02-03 22:31:48 +00:00
Benedict Wong
29044acc20 Merge changes I446a8595,I68d2293f 
* changes:
  Add VpnManager calls to ConnectivityService
  Add basic logic for profile-based VPNs
 2020-02-03 22:31:37 +00:00
Anton Hansson
9bf0c496df Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" 2020-02-03 22:29:37 +00:00
Treehugger Robot
91d0f80387 Merge "RecordingActivityMonitor: remove spam from death events" 2020-02-03 22:20:29 +00:00
Automerger Merge Worker
b776a67520 Merge "Create new context with new resources" am: 5a7efe50ec 
Change-Id: I96de87ea8cf16800d0ea0ada34e2021ae4a99469
 2020-02-03 21:49:35 +00:00
Jordan Liu
5a7efe50ec Merge "Create new context with new resources" 2020-02-03 21:39:30 +00:00
Hai Zhang
e244583ef0 Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing. 
Bug: 136503238
Test: presubmit
Merged-In: I7e40296120e18f2dfbbf04b5ae9d148724afa920
Change-Id: I7e40296120e18f2dfbbf04b5ae9d148724afa920
 2020-02-03 13:05:28 -08:00
Jordan Liu
0e161088fd Create new context with new resources 
The old implementation of this function had the unintended side effect
of modifying the default configuration for the context which the caller
passed in. This CL avoids that by creating a new context with the new
configuration.

Test: atest SubscriptionControllerTest#testGetResourcesForSubId
Bug: 146481715
Change-Id: I6539817caa67e1100e50018fa0186993a1f56ccb
Merged-In: I6539817caa67e1100e50018fa0186993a1f56ccb
 2020-02-03 20:52:09 +00:00
Makoto Onuki
4056d87005 Do not use @SystemApi(client = MODULE_APPS) (documents/settings) 
There will be no special protection mechanisms around MODULE_APPS,
so we're going to remove it for now.

All the MODULE_APPS should be protected with a permission, etc, so
the change should be safe.

Bug: 148177503
Test: Build / treehugger
Change-Id: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
Merged-In: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
 2020-02-03 20:37:22 +00:00
Mikhail Naganov
595541d41c RecordingActivityMonitor: remove spam from death events 
Release death handler when its recorder is removed from tracking
to avoid logspam of "Unexpected event" messages.

Bug: 136279123
Bug: 147776323
Test: atest android.media.cts.AudioRecordingConfigurationTest
      adb shell logcat | grep "Unexpected event"

Change-Id: I085ee545a07c7d3ada05c575878998a0e76a135b
Merged-In: I085ee545a07c7d3ada05c575878998a0e76a135b
 2020-02-03 12:23:01 -08:00
Automerger Merge Worker
72dcf0a781 Merge changes Ib7daba9c,Ib692bff0 am: 75b7e58c47 
Change-Id: I3067f3dfa8a5d0167f27af5af768d303bccd5510
 2020-02-03 20:08:24 +00:00
Treehugger Robot
75b7e58c47 Merge changes Ib7daba9c,Ib692bff0 
* changes:
  UpdateEngine: add WorkerThread annotation.
  UpdateEngine.AllocateSpaceResult: rename functions
 2020-02-03 19:55:48 +00:00
Automerger Merge Worker
99703f7876 Merge "Tweak the defaults of module stubs" am: b5997d270d 
Change-Id: I58560b8474aa907a99e6a8f1c38e3e364e832086
 2020-02-03 18:15:55 +00:00
Anton Hansson
b5997d270d Merge "Tweak the defaults of module stubs" 2020-02-03 18:05:50 +00:00
Automerger Merge Worker
8586776fbf Merge "API docs tidy up" am: 6aef6673df 
Change-Id: I0be18d5713fa9ad17a53cfbf2ba445a181bc4a0c
 2020-02-03 18:00:44 +00:00
Neil Fuller
6aef6673df Merge "API docs tidy up" 2020-02-03 17:48:03 +00:00
Automerger Merge Worker
2f0862964d Merge "Make wifi module use shared metalava args" am: 99c83943aa 
Change-Id: I6d52ebc20826807907739bc581b8b23e4de42d84
 2020-02-03 16:36:31 +00:00
Anton Hansson
99c83943aa Merge "Make wifi module use shared metalava args" 2020-02-03 16:26:21 +00:00
Automerger Merge Worker
20883ee618 Merge changes If8c8d1f3,I3a804a9f am: 1fcefb0285 
Change-Id: I6139500edf9c93d2995b822b19e9e9aaf3beaa7c
 2020-02-03 15:07:46 +00:00
Automerger Merge Worker
704eab60eb Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 4997b874a3 
Change-Id: Ia393d1ee102ae7dfc4a7b5698b5f3b4882605e7c
 2020-02-03 15:07:20 +00:00
Automerger Merge Worker
52309b9871 Merge "Add callback registration in ConnectivityService." am: e534c45250 
Change-Id: Idf067ebd9299ca036965b7c7f82c13a6f659a821
 2020-02-03 15:06:50 +00:00
Treehugger Robot
1fcefb0285 Merge changes If8c8d1f3,I3a804a9f 
* changes:
  [NS A27] Remove useless logs and a useless var
  [NS A26] Move available callbacks out of the rematch computation
 2020-02-03 15:06:19 +00:00
Anton Hansson
a12addc295 Tweak the defaults of module stubs 
We will have 4 stubs for each framework module:
- stubs-publicapi with check_api
- stubs-systemapi with check_api
- api-module_api with check_api, just module_api
- stubs-module_api without check_api, module_api + priv_apps

This is because we want the stubs of module_api to include the priv_apps
system APIs, but don't want the api .txt files to contain them.

The check_api attrs will be setup later, when the individual modules
have been set up to inherit these defaults correctly.

Bug: 147768409
Test: m
Change-Id: Ie0fbff6949c8df3d6211558de7373bddb8b95768
 2020-02-03 14:59:40 +00:00
Anton Hansson
5036ab60c2 Make wifi module use shared metalava args 
Also (hopefully) temporarily filter out com.android.server
from the stubs, as the wifi module has a server class in
it.

Bug: 137191822
Test: m
Change-Id: I2c62fc16c676305e9ee739285f49656075f38b97
Merged-In: I2c62fc16c676305e9ee739285f49656075f38b97
(cherry picked from commit 0c2ebe2bbf)
 2020-02-03 14:57:55 +00:00
Cody Kesting
4997b874a3 Merge "Update javadocs for ConnectivityDiagnosticsManager." 2020-02-03 14:56:13 +00:00
Cody Kesting
e534c45250 Merge "Add callback registration in ConnectivityService." 2020-02-03 14:55:54 +00:00
Automerger Merge Worker
a8116d930c Merge "Minor refactor of ChangeReporter and PlatformCompat" am: 55d16fac97 
Change-Id: I691696fa0ffa50c87bb3afb26173f4cc595453a2
 2020-02-03 12:46:12 +00:00
Treehugger Robot
55d16fac97 Merge "Minor refactor of ChangeReporter and PlatformCompat" 2020-02-03 12:37:48 +00:00
Neil Fuller
fb23c3ea2e API docs tidy up 
Based on feedback from API council.

Bug: 148402959
Bug: 148402200
Test: treehugger only
Change-Id: I273ced8ec61dd72d8fd290b976ecfe1e613a1941
 2020-02-03 12:17:27 +00:00
Automerger Merge Worker
d0045fbffd Merge "Rename phoneId to slotIndex" am: 4e540a1c59 
Change-Id: If220028441547c85c3540c52af9f714a15853b3a
 2020-02-03 12:09:10 +00:00
Neil Fuller
4e540a1c59 Merge "Rename phoneId to slotIndex" 2020-02-03 11:55:39 +00:00
changbetty
0ae6355421 [Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager 
Bug: 146309719
Test: make
Change-Id: Ibb68cd4e6a6ba49c56b313380ddf16734813459b
Merged-In: Ibb68cd4e6a6ba49c56b313380ddf16734813459b
 2020-02-03 19:47:22 +08:00
Aaron Huang
79f52ea525 Add setSubscriptionOverride() to system API 
Add new API setSubscriptionOverride() in NetworkPolicyManager
and rename constants OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*.
Make them @SystemApi for mainline support.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I56c777aa66d6f455695f133f9889979c13cd1bc8
Merged-In: I56c777aa66d6f455695f133f9889979c13cd1bc8
 2020-02-03 19:26:42 +08:00
Automerger Merge Worker
4b9770b9f5 Merge "Fix NPE in tethering startup" am: 6bf0c6185d 
Change-Id: Ife21cf93c62be0a7da2dee77d31a8f3c9b23b575
 2020-02-03 03:08:43 +00:00
Mark Chien
6bf0c6185d Merge "Fix NPE in tethering startup" 2020-02-03 02:52:43 +00:00
Automerger Merge Worker
07ba724d11 Merge "Export Wifi Parcelables AIDLs from framework.jar" am: 5ccfef6e6b 
Change-Id: I575ddb5008d16ebcb32a8fc5196cd82f9eda1e11
 2020-02-03 02:13:21 +00:00
Treehugger Robot
5ccfef6e6b Merge "Export Wifi Parcelables AIDLs from framework.jar" 2020-02-03 02:05:12 +00:00
Automerger Merge Worker
bbfcf7fc56 Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f5b 
Change-Id: I363ded95542c1402b6828d5475e04d2554c8d01e
 2020-02-01 23:41:15 +00:00
Automerger Merge Worker
44d8a611c4 Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" am: f0f3a0f48e 
Change-Id: Ia5a08318ebdfdee7634a6cec492b36f35e143870
 2020-02-01 23:37:45 +00:00
Treehugger Robot
7a028c7f5b Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" 2020-02-01 23:37:34 +00:00
Treehugger Robot
f0f3a0f48e Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" 2020-02-01 23:27:10 +00:00
Automerger Merge Worker
8752cb4fc7 Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: ea711aba95 
Change-Id: Ib585b2b8831e12ba8231704a99a47ceaf0da0e8e
 2020-02-01 22:32:12 +00:00