Daniel Colascione
1077797c14
Merge changes from topic "property-handle"
...
am: 54543bb423
2019-11-20 20:47:44 -08:00
Meng Wang
f1b067c671
Merge "Use TelephonyManager instead of ITelephony Binder"
...
am: de953fd5f2
2019-11-20 20:44:19 -08:00
Daniel Colascione
54543bb423
Merge changes from topic "property-handle"
...
* changes:
Add new SystemProperties.Handle interface
Reimplement android.os.SystemProperties in terms of libc facilities
2019-11-21 04:38:03 +00:00
Meng Wang
de953fd5f2
Merge "Use TelephonyManager instead of ITelephony Binder"
2019-11-21 04:36:10 +00:00
Jack Yu
ccf305e76f
Merge "telephony annotations part 2"
...
am: 1a9f2d0e78
2019-11-20 17:02:30 -08:00
Jordan Liu
277ea3584f
Merge "Remove unneeded @RequiresPermission annotation"
...
am: 0a1b47573e
2019-11-20 14:22:03 -08:00
Chen Xu
b6d1319d1a
telephony annotations part 2
...
adding missing annotations
Bug: 140908357
Test: Build
Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
(cherry picked from commit f85cf993d3
2019-11-20 14:09:16 -08:00
Jordan Liu
0a1b47573e
Merge "Remove unneeded @RequiresPermission annotation"
2019-11-20 22:04:20 +00:00
Makoto Onuki
056b8f00b7
Merge "Add Context.createContextAsUser()"
...
am: 63d5e4a0b9
2019-11-20 14:04:20 -08:00
Treehugger Robot
63d5e4a0b9
Merge "Add Context.createContextAsUser()"
2019-11-20 21:53:01 +00:00
Meng Wang
a73bed81ae
Use TelephonyManager instead of ITelephony Binder
...
Bug: 140908357
Test: make
Change-Id: If3be915329cc27c560af3fd71a903984a626aca8
2019-11-20 10:05:33 -08:00
Tyler Gunn
5474568b87
Merge "Add prioritized enableCarMode API in UiModeManager"
...
am: 8e7a1f8528
2019-11-20 00:17:34 -08:00
Tyler Gunn
8e7a1f8528
Merge "Add prioritized enableCarMode API in UiModeManager"
2019-11-20 07:08:19 +00:00
Meng Wang
9e294c69d3
Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*"
...
am: 9636d7e3af
2019-11-19 22:07:44 -08:00
Makoto Onuki
9432f7d43c
Add Context.createContextAsUser()
...
Without it, apps (mainline modules) will need to use createPackageContext...,
which is a bit painful.
Bug: 142472686
Test: atest android.content.cts.ContextTest#testCreateContextAsUser
Change-Id: Id640e03862462724df1a4a3101f0b08faafba22f
(cherry picked from commit b844001d6a
2019-11-19 20:51:04 -08:00
Treehugger Robot
9636d7e3af
Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*"
2019-11-20 04:26:47 +00:00
Meng Wang
d641117588
Merge "Move RLog out of telephony module"
...
am: 7622ccb5f0
2019-11-19 18:13:24 -08:00
Treehugger Robot
7622ccb5f0
Merge "Move RLog out of telephony module"
2019-11-20 01:59:18 +00:00
Meng Wang
e88b4d2918
Move RLog out of telephony module
...
Bug: 144374158
Test: make
Change-Id: I7702677c8bb2529655ef03fc0a27c33743ae01b5
Merged-In: If983bc315218486be73567cd1919d1f60250f670
2019-11-19 16:16:08 -08:00
Patrick Baumann
92269e5ef8
Merge "DO NOT MERGE Avoids deadlock when applying preferred activities"
...
am: 35dd014a79
2019-11-19 16:05:31 -08:00
Charles Munger
080ddd5dfd
Merge "Deprecate implicit Handler constructors"
...
am: 560c3ebe1e
2019-11-19 16:04:15 -08:00
Treehugger Robot
35dd014a79
Merge "DO NOT MERGE Avoids deadlock when applying preferred activities"
2019-11-19 23:38:21 +00:00
Rahul Sabnis
87dd39f1bc
Merge "Revert "Re-add getAliasName to fix build breakage""
...
am: 944fed6b66
2019-11-19 15:34:01 -08:00
Ugo Yu
f228b9b330
Merge "Add method to convert profile ID into human readable string"
...
am: d007cfcdf4
2019-11-19 15:29:34 -08:00
Charles Munger
310697d68d
Merge "Deprecate account-specific activity subclass"
...
am: b7c5d354fb
2019-11-19 15:29:12 -08:00
Andrei-Valentin Onea
97a11fb8ab
Merge "Revert "Revert submission from topic "separate-testing".""
...
am: addcc36534
2019-11-19 15:28:29 -08:00
Treehugger Robot
560c3ebe1e
Merge "Deprecate implicit Handler constructors"
2019-11-19 23:28:12 +00:00
Rahul Sabnis
3e4a53735e
Merge "Create systemapis to connect/disconnect all bt profiles"
...
am: 7700b81cb3
2019-11-19 15:16:53 -08:00
Tyler Gunn
f05f2c2cc2
Add prioritized enableCarMode API in UiModeManager
...
Per design doc (go/android-car-mode-design), added new system API to
enable car mode and specify a priority for the calling app.
Also modified UiModeManager to pass the package name of the caller to
UiModeManagerService.
Bug: 136109592
Test: Added new unit tests and CTS tests.
Test: Added Telecom test app functionality to verify.
Change-Id: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
Merged-In: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
2019-11-19 23:15:52 +00:00
Patrick Baumann
3fa8853331
DO NOT MERGE Avoids deadlock when applying preferred activities
...
Prior to this change, we were resolving the mime type of a given intent
while holding the package lock. With this change, we instead rely on the
preferred-activity declaration to define the mime type if it's
important, removing need for an activity manager service call and the
potential for deadlock.
Fixes: 143105100
Test: Manual; sideload to /system/etc/preferred-apps/ and reset app preferences
Change-Id: Ia87b7ecbd7987ef654fb0fc2bda942cd6a9c00a7
2019-11-19 21:43:48 +00:00
Daniel Colascione
6e2cff7fa1
Add new SystemProperties.Handle interface
...
This new interface allows Java code to look up property values without
paying for the name->prop_info mapping and, in the case of looking up
scalars, without doing any allocation.
Bug: 140788621
Test: added tests
Test: atest FrameworksCoreSystemPropertiesTests
Change-Id: I46d12f62499e9e124fe9add588376d724b364d5d
2019-11-19 13:28:56 -08:00
Daniel Colascione
5e8ba5f05a
Reimplement android.os.SystemProperties in terms of libc facilities
...
A subsequent CL will implement a new prop_info based properties API on
top of this CL.
Test: boots
Test: atest FrameworksCoreSystemPropertiesTests
Bug: 140788621
Change-Id: Id8dd02fff7b1c0815a27ab1dfdde1700447a414c
2019-11-19 13:27:53 -08:00
Hall Liu
dab3711435
Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
...
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Jordan Liu
31a4da61b5
Remove unneeded @RequiresPermission annotation
...
Fixes: 144360225
Test: no change to behavior
Change-Id: I7b3ab01c4d232013dcc19de32cc8e2cee9b8cb5a
2019-11-19 11:47:53 -08:00
Treehugger Robot
944fed6b66
Merge "Revert "Re-add getAliasName to fix build breakage""
2019-11-19 19:44:45 +00:00
Treehugger Robot
d007cfcdf4
Merge "Add method to convert profile ID into human readable string"
2019-11-19 18:04:03 +00:00
Charles Munger
b7c5d354fb
Merge "Deprecate account-specific activity subclass"
2019-11-19 16:42:55 +00:00
Andrei-Valentin Onea
addcc36534
Merge "Revert "Revert submission from topic "separate-testing".""
2019-11-19 14:12:47 +00:00
Meng Wang
91e4cc8a7c
Do not use hidden telephony API PhoneConstants.PRESENTATION_*
...
Replaced with TelecomManager.PRESENTATION_*
Bug: 140908357
Test: make
Change-Id: Ib7c2531d69b14307e17ed5dd62f3aa8d56153330
2019-11-18 17:03:02 -08:00
Rahul Sabnis
7700b81cb3
Merge "Create systemapis to connect/disconnect all bt profiles"
2019-11-18 23:15:06 +00:00
Hall Liu
1d7a53da98
Merge changes from topic "mainline4"
...
* changes:
Add new API for Telecom to send phone state
Minor style correction to avoid merge conflict
non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
Beverly
e9e1e8290a
Merge "Update equals and hashCode methods of NoMan.Policy"
...
am: e3d6061a67
2019-11-18 13:53:33 -08:00
Treehugger Robot
e3d6061a67
Merge "Update equals and hashCode methods of NoMan.Policy"
2019-11-18 21:05:15 +00:00
Charles Munger
67127ff179
Deprecate account-specific activity subclass
...
Bug: 144042891
Test: No behavior changes
Change-Id: I22cc3f2d19280adeb627c5d9797621fac8b2da1d
2019-11-18 12:53:43 -08:00
Andrei Onea
02d81c0c11
Revert "Revert submission from topic "separate-testing"."
...
This reverts commit 44d9a1d8dd
2019-11-18 20:05:54 +00:00
Chen Xu
2d98a66b18
Merge "add a new telephony protection level"
...
am: cd953e939f
2019-11-18 11:16:00 -08:00
Chen Xu
cd953e939f
Merge "add a new telephony protection level"
2019-11-18 19:04:05 +00:00
Rahul Sabnis
91edb7e642
Revert "Re-add getAliasName to fix build breakage"
...
This reverts commit d14320d21c
2019-11-18 18:59:55 +00:00
Beverly
3fe3e8195a
Update equals and hashCode methods of NoMan.Policy
...
Test: atest AudioManagerTest#testPriorityOnlyChannelsCanBypassDnd
Fixes: 142643922
Change-Id: I15835f784ba73b40eccf92a0a430905d28647669
Merged-In: I15835f784ba73b40eccf92a0a430905d28647669
(cherry picked from commit 4f8b0224e1
2019-11-18 13:55:43 -05:00
Roshan Pius
402e33e6e7
Merge "StaticIpConfiguration: Couple of minor fixes"
...
am: 5c4c9872c5
2019-11-18 07:10:41 -08:00
