markchien
c992d0f4a9
Support entitlement check in DSDS
...
Get resource from preferred SIM's subId.
Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b
2019-02-12 16:17:36 +08:00
Kiyoung Kim
4d8f4919e0
Merge "Schematize Display system properties"
...
am: b139a4c16b
Change-Id: I82b157865fb288044c251d6d78ca850b22502db0
2019-02-11 19:13:51 -08:00
Kiyoung Kim
6ade19a3bf
Schematize ADB system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
Merged-In: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
2019-02-12 02:58:11 +00:00
Treehugger Robot
b139a4c16b
Merge "Schematize Display system properties"
2019-02-12 02:50:08 +00:00
android-build-team Robot
98cdb732ce
Snap for 5180536 from c103b546d2 to pi-platform-release
...
Change-Id: Ice12b1967a41a792bb4e1816d0fe07bc61328788
2019-02-09 02:23:26 +00:00
Hall Liu
a6840cac03
Add ACCESS_FINE_LOCATION to permissions
...
Add ACCESS_FINE_LOCATION to permissions in order to satisfy new
restrictions.
Bug: 116258458
Test: manual
Change-Id: Icdc45c3a02cd5bf784d0475243b7d53ba9861777
2019-02-05 17:09:22 -08:00
Stanley Tng
f8ba53c6fb
Merge "Update the Hearing Aids Strings"
...
am: 3afa2a7acb
Change-Id: I5310642f04558d961aa82df933791b08d883d92e
2019-02-05 13:05:41 -08:00
Treehugger Robot
3afa2a7acb
Merge "Update the Hearing Aids Strings"
2019-02-05 20:20:51 +00:00
Stanley Tng
d6f1b59c93
Update the Hearing Aids Strings
...
Minor update to the Hearing Aids string by making it plural and also
remove a redundant word "currently".
Bug: 121036176
Test: Compile
Change-Id: I829b8028408f5d07d950580bd4d90ca41bd334f3
2019-02-02 17:56:19 +00:00
Pavel Grafov
7c47743851
Merge "Update to use new ConnectivityManager API."
...
am: 70b1830e7e
Change-Id: Ide228930858fc8eccfac060858b0da86725f229a
2019-01-28 20:28:09 -08:00
Pavel Grafov
70b1830e7e
Merge "Update to use new ConnectivityManager API."
2019-01-28 20:15:49 +00:00
Pavel Grafov
6a0a7be9a2
Update to use new ConnectivityManager API.
...
Bug: 77468593
Test: builds
Change-Id: I1fa542e015add2dd8b0e8620f2021c1a5c1c9f1a
2019-01-25 18:58:17 +00:00
Eran Messeri
74bd41f305
Merge "Add Enterprise owners for Enterprise settings"
...
am: 35416e7529
Change-Id: I2823cff17e5b77b3cd449d739c908b0b8c0c9c58
2019-01-24 15:03:28 -08:00
Treehugger Robot
35416e7529
Merge "Add Enterprise owners for Enterprise settings"
2019-01-24 22:56:27 +00:00
Dan Albert
2105dc52dd
Merge "Revert "Update to use new ConnectivityManager API.""
...
am: 9c7ddce334
Change-Id: Icd2bf95c10716d324b47151fddc34a31f5736355
2019-01-24 13:39:06 -08:00
Dan Albert
9c7ddce334
Merge "Revert "Update to use new ConnectivityManager API.""
2019-01-24 21:08:46 +00:00
Dan Albert
6e91f68ae4
Revert "Update to use new ConnectivityManager API."
...
This reverts commit 9a9f6f313b .
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Ia0ff7cdf77b4edf3bdf5e4c54376b730df48373e
2019-01-24 21:06:02 +00:00
Pavel Grafov
525b0dbc17
Merge "Update to use new ConnectivityManager API."
...
am: 161f5ec3e9
Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76
2019-01-24 09:50:37 -08:00
Pavel Grafov
161f5ec3e9
Merge "Update to use new ConnectivityManager API."
2019-01-24 17:34:55 +00:00
Eran Messeri
3cb95abd04
Add Enterprise owners for Enterprise settings
...
Add owners from the Android Enterprise team to source files that are
either owned or are mostly modified by the Android Enterprise team.
Test: gerrit uploader
Bug: 33166666
Change-Id: I8b4ec7c8895b02c45a6a14d52a3742334234904a
2019-01-24 12:29:56 +00:00
Pavel Grafov
9a9f6f313b
Update to use new ConnectivityManager API.
...
Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1
2019-01-23 19:53:01 +00:00
Kiyoung Kim
59e3152a0e
Schematize Display system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: If0b7658e4f04848a6a068c18e93026591b7b5518
Merged-In: I83b40ddfcde32d8d03fae73f5c252013933c466c
2019-01-21 15:00:10 +09:00
Fan Zhang
0d8ea3bfce
Merge "Add Dynamic tiles"
...
am: 15bf05f6fd
Change-Id: I0998725bc59e1d4f9b8afff388c2a9a3c680423c
2019-01-17 17:08:14 -08:00
Fan Zhang
15bf05f6fd
Merge "Add Dynamic tiles"
2019-01-18 00:47:52 +00:00
jin.dong
b82df9bd43
Add Dynamic tiles
...
Add new CategoryKey for screens below:
about_legal.xml
my_device_info.xml
battery_saver_settings.xml
Bug: 113249409
Change-Id: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
Merged-In: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
2019-01-16 00:54:07 +00:00
Anton Hansson
850fdb32e9
Merge "Make the Settings permission a required module" am: 480b56e3d6
...
am: bc79e6e6f3
Change-Id: I775d8b3a84ef2c1eccfb8d590e97ee1dcbeedf5d
2019-01-14 08:15:32 -08:00
Anton Hansson
bc79e6e6f3
Merge "Make the Settings permission a required module"
...
am: 480b56e3d6
Change-Id: I2316d82bb50778e6f524d708cc1711dcd69f1f9d
2019-01-14 08:11:21 -08:00
Anton Hansson
480b56e3d6
Merge "Make the Settings permission a required module"
2019-01-14 16:03:16 +00:00
Anton Hansson
09064cf6d9
Make the Settings permission a required module
...
This will include the Settings permission file whenever
the Settings app is installed.
Bug: 110072687
Test: make
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
Merged-In: Ia2548355282498bceeffddb564de32a6cb857c66
(cherry picked from commit 16322a0271 )
2019-01-14 15:50:28 +00:00
Anton Hansson
403fe5d83c
Merge "Move Settings app to /product" am: 0a399bf543
...
am: 297fe94122
Change-Id: I6f04ca71a2a4af1cfb4bc07019f991bc845fd8e6
2019-01-14 01:50:56 -08:00
Anton Hansson
297fe94122
Merge "Move Settings app to /product"
...
am: 0a399bf543
Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d
2019-01-14 01:22:53 -08:00
Anton Hansson
0a399bf543
Merge "Move Settings app to /product"
2019-01-14 09:06:25 +00:00
Bill Yi
004425d2b9
[automerger skipped] Import translations. DO NOT MERGE
...
am: e18f734843 -s ours
am skip reason: subject contains skip directive
Change-Id: I7eeb038b93fe47601b946e74d0309e6923e048d5
2019-01-13 16:39:54 -08:00
Bill Yi
e18f734843
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
2019-01-12 23:00:35 -08:00
Anton Hansson
9a7786b3e1
Move Settings app to /product
...
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.
Bug: 110072687
Test: make
Change-Id: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
Merged-In: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
(cherry picked from commit f109282c8e )
2019-01-11 16:41:54 +00:00
Nathan Harold
c015a1bac0
Merge "Fix BandMode Dialog Crash on Open due to Style" am: 7588ef1518
...
am: 7aacdc2c13
Change-Id: I50588e17f07d89daa3a989a72080a4fe695b4729
2019-01-07 17:31:14 -08:00
Nathan Harold
7aacdc2c13
Merge "Fix BandMode Dialog Crash on Open due to Style"
...
am: 7588ef1518
Change-Id: I0dd365652f4deac7b69b181317b0dd86610400a7
2019-01-07 17:16:52 -08:00
Nathan Harold
7588ef1518
Merge "Fix BandMode Dialog Crash on Open due to Style"
2019-01-08 00:18:21 +00:00
Ruchi Kandoi
a7c886925f
Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52
...
am: 39845367ab
Change-Id: Ia7fc968221a6eb314a9ee384e0dd84d3aa0e84b4
2019-01-04 14:07:48 -08:00
Ruchi Kandoi
39845367ab
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
...
am: 6827785e52
Change-Id: I7c71bad831892bf9a853ca5d4777e42c1b3a9171
2019-01-04 13:58:22 -08:00
Treehugger Robot
6827785e52
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
2019-01-04 21:49:14 +00:00
Nathan Harold
63b1ab12f6
Fix BandMode Dialog Crash on Open due to Style
...
This sidesteps an error saying that the radio
BandMode activity must inherit from an AppCompat
style. Instead the window is now full-screen and
matches the theme of the RadioInfo menu.
Bug: 117571514
Test: manual - open the activity without a crash and
verify that the new style change is effective.
Change-Id: I6e49d731e039709db43dfa6531723781e9e48640
2019-01-03 09:51:49 -08:00
Bill Yi
5285ef3490
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9e39db9d62 -s ours
Change-Id: I7fee4d617fe40d725dbd8bee03e138b95fb3cb9c
2018-12-28 18:03:18 -08:00
Bill Yi
9e39db9d62
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
2018-12-28 13:41:40 -08:00
Pengquan Meng
1f2ba13698
Merge "Add PreferenceChangeListener to ApnSettings" am: 66d28c3e37
...
am: 9745ec5421
Change-Id: I6a6021f131f568b51fb491248d71e4ccbcdc49ef
2018-12-27 15:55:34 -08:00
Pengquan Meng
9745ec5421
Merge "Add PreferenceChangeListener to ApnSettings"
...
am: 66d28c3e37
Change-Id: Ideef529174f7b8b89f5668f7c9366cea090df68f
2018-12-27 15:51:21 -08:00
Pengquan Meng
66d28c3e37
Merge "Add PreferenceChangeListener to ApnSettings"
2018-12-27 23:36:18 +00:00
Lei Yu
2b976cce96
[automerger skipped] Merge "Update color-check-baseline.xml" am: 81cb8a2612 -s ours
...
am: 3461bd0644 -s ours
Change-Id: I6e510de1b75e2656e4f82727e2a9911f3e32d8d7
2018-12-27 13:49:35 -08:00
Lei Yu
3461bd0644
[automerger skipped] Merge "Update color-check-baseline.xml"
...
am: 81cb8a2612 -s ours
Change-Id: Id047f4c0964dc1f38ebf4c1afc46796c9c793ea1
2018-12-27 13:45:22 -08:00
Lei Yu
81cb8a2612
Merge "Update color-check-baseline.xml"
2018-12-27 21:35:31 +00:00