OSDN Git Service
Brad Ebinger [Thu, 14 Feb 2019 21:19:37 +0000 (13:19 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am:
db7da4cba8
am:
ee4a5291a1
Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33
Brad Ebinger [Thu, 14 Feb 2019 21:15:44 +0000 (13:15 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am:
db7da4cba8
Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
Brad Ebinger [Thu, 14 Feb 2019 21:01:05 +0000 (21:01 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
markchien [Thu, 14 Feb 2019 06:39:00 +0000 (22:39 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition" am:
f1e3e9d627
am:
2ee5beaa32
Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
markchien [Thu, 14 Feb 2019 06:34:49 +0000 (22:34 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition"
am:
f1e3e9d627
Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
Treehugger Robot [Thu, 14 Feb 2019 06:19:30 +0000 (06:19 +0000)]
Merge "Fix wrong TetherProvisioningActivity definition"
markchien [Thu, 14 Feb 2019 03:11:31 +0000 (11:11 +0800)]
Fix wrong TetherProvisioningActivity definition
Bug:
122108346
Bug:
120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
Hall Liu [Thu, 14 Feb 2019 00:33:22 +0000 (16:33 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions" am:
a23ceba5c3
am:
5232a30b03
Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0
Hall Liu [Thu, 14 Feb 2019 00:14:10 +0000 (16:14 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
am:
a23ceba5c3
Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
Fan Zhang [Wed, 13 Feb 2019 18:29:46 +0000 (10:29 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am:
dabfd96c82
am:
32fbf4740d
Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
Fan Zhang [Wed, 13 Feb 2019 18:16:15 +0000 (10:16 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am:
dabfd96c82
Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Fan Zhang [Wed, 13 Feb 2019 17:59:40 +0000 (17:59 +0000)]
Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit
910457e37a45c4c717466aadfdf9d3fcd62135d4.
Fixes:
124370422
Reason for revert: b/
124370422
Error:
The following topic from AOSP:
https://android-review.googlesource.com/q/topic:%
22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
Mark Chien [Wed, 13 Feb 2019 04:06:32 +0000 (20:06 -0800)]
Merge "Support entitlement check in DSDS" am:
e3b4e0262c
am:
0ac1c323b2
Change-Id: I9249eabb454648594ac5e303405f483266eee551
Fan Zhang [Wed, 13 Feb 2019 03:33:56 +0000 (19:33 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am:
3905ad125d
am:
dd3e2c4f27
Change-Id: Ia2c1fa2eabcbe784e0d5525baf68d866f2366e6f
Mark Chien [Wed, 13 Feb 2019 03:25:31 +0000 (19:25 -0800)]
Merge "Support entitlement check in DSDS"
am:
e3b4e0262c
Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
Fan Zhang [Wed, 13 Feb 2019 02:41:40 +0000 (18:41 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am:
3905ad125d
Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support entitlement check in DSDS"
Kiyoung Kim [Wed, 13 Feb 2019 02:18:16 +0000 (18:18 -0800)]
Merge "Schematize ADB system properties" am:
750b90a22b
am:
974ace22f9
Change-Id: I04ab4b50e76d05341b4033c5e44cc6cb62964c39
Kiyoung Kim [Wed, 13 Feb 2019 02:06:33 +0000 (18:06 -0800)]
Merge "Schematize ADB system properties"
am:
750b90a22b
Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Torbjorn Eklund [Wed, 9 Jan 2019 10:09:18 +0000 (11:09 +0100)]
Close Wi-Fi Calling screen if provisioning status changes to disallow
Starts to listen for provisioning changes in Wi-Fi Calling screen and
closes the screen if the Wi-Fi Calling provisioning status changes to
disallow.
This prevents the Wi-Fi Calling screen from being kept open if the Wi-Fi
Calling provisioning status is changed to disallow while the Wi-Fi
Calling screen is open.
Bug:
119389855
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Merged-In: I2af91c3734274f0aea942a8bb894d6f4ce295354
Change-Id: I2af91c3734274f0aea942a8bb894d6f4ce295354
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"
markchien [Fri, 11 Jan 2019 08:18:20 +0000 (16:18 +0800)]
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
Kiyoung Kim [Tue, 12 Feb 2019 03:25:50 +0000 (19:25 -0800)]
Merge "Schematize Display system properties" am:
b139a4c16b
am:
4d8f4919e0
Change-Id: I35412244d1fa97cb479d060e876bfddac6b523cb
Kiyoung Kim [Tue, 12 Feb 2019 03:13:51 +0000 (19:13 -0800)]
Merge "Schematize Display system properties"
am:
b139a4c16b
Change-Id: I82b157865fb288044c251d6d78ca850b22502db0
Kiyoung Kim [Thu, 27 Dec 2018 05:31:48 +0000 (14:31 +0900)]
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
Treehugger Robot [Tue, 12 Feb 2019 02:50:08 +0000 (02:50 +0000)]
Merge "Schematize Display system properties"
Hall Liu [Wed, 28 Nov 2018 01:00:50 +0000 (17:00 -0800)]
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
Stanley Tng [Tue, 5 Feb 2019 21:16:09 +0000 (13:16 -0800)]
Merge "Update the Hearing Aids Strings" am:
3afa2a7acb
am:
f8ba53c6fb
Change-Id: I5d6a76265ccb0a7263bb689fa8a3ef4a0044e77a
Stanley Tng [Tue, 5 Feb 2019 21:05:41 +0000 (13:05 -0800)]
Merge "Update the Hearing Aids Strings"
am:
3afa2a7acb
Change-Id: I5310642f04558d961aa82df933791b08d883d92e
Treehugger Robot [Tue, 5 Feb 2019 20:20:51 +0000 (20:20 +0000)]
Merge "Update the Hearing Aids Strings"
Stanley Tng [Sat, 2 Feb 2019 02:16:30 +0000 (18:16 -0800)]
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
Pavel Grafov [Tue, 29 Jan 2019 05:34:50 +0000 (21:34 -0800)]
Merge "Update to use new ConnectivityManager API." am:
70b1830e7e
am:
7c47743851
Change-Id: I41b4f42c88895dd26a65fe0c92b71dbe1e7a3c08
Pavel Grafov [Tue, 29 Jan 2019 04:28:09 +0000 (20:28 -0800)]
Merge "Update to use new ConnectivityManager API."
am:
70b1830e7e
Change-Id: Ide228930858fc8eccfac060858b0da86725f229a
Pavel Grafov [Mon, 28 Jan 2019 20:15:49 +0000 (20:15 +0000)]
Merge "Update to use new ConnectivityManager API."
Pavel Grafov [Fri, 25 Jan 2019 18:58:17 +0000 (18:58 +0000)]
Update to use new ConnectivityManager API.
Bug:
77468593
Test: builds
Change-Id: I1fa542e015add2dd8b0e8620f2021c1a5c1c9f1a
Eran Messeri [Thu, 24 Jan 2019 23:11:42 +0000 (15:11 -0800)]
Merge "Add Enterprise owners for Enterprise settings" am:
35416e7529
am:
74bd41f305
Change-Id: I64d13eaab1b8e1a26ef9cadcf6e34c9b65f78076
Eran Messeri [Thu, 24 Jan 2019 23:03:28 +0000 (15:03 -0800)]
Merge "Add Enterprise owners for Enterprise settings"
am:
35416e7529
Change-Id: I2823cff17e5b77b3cd449d739c908b0b8c0c9c58
Treehugger Robot [Thu, 24 Jan 2019 22:56:27 +0000 (22:56 +0000)]
Merge "Add Enterprise owners for Enterprise settings"
Dan Albert [Thu, 24 Jan 2019 21:49:58 +0000 (13:49 -0800)]
Merge "Revert "Update to use new ConnectivityManager API."" am:
9c7ddce334
am:
2105dc52dd
Change-Id: I15aa3b38af77c6e222db38b89e3f29562437f4dd
Dan Albert [Thu, 24 Jan 2019 21:39:06 +0000 (13:39 -0800)]
Merge "Revert "Update to use new ConnectivityManager API.""
am:
9c7ddce334
Change-Id: Icd2bf95c10716d324b47151fddc34a31f5736355
Dan Albert [Thu, 24 Jan 2019 21:08:46 +0000 (21:08 +0000)]
Merge "Revert "Update to use new ConnectivityManager API.""
Dan Albert [Thu, 24 Jan 2019 21:06:02 +0000 (21:06 +0000)]
Revert "Update to use new ConnectivityManager API."
This reverts commit
9a9f6f313b1f9bc7a5193eda092ea3ee3ae67667.
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Ia0ff7cdf77b4edf3bdf5e4c54376b730df48373e
Pavel Grafov [Thu, 24 Jan 2019 18:07:47 +0000 (10:07 -0800)]
Merge "Update to use new ConnectivityManager API." am:
161f5ec3e9
am:
525b0dbc17
Change-Id: Id798a6b94be2c699c4de1c294e418a621b0adea2
Pavel Grafov [Thu, 24 Jan 2019 17:50:37 +0000 (09:50 -0800)]
Merge "Update to use new ConnectivityManager API."
am:
161f5ec3e9
Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76
Pavel Grafov [Thu, 24 Jan 2019 17:34:55 +0000 (17:34 +0000)]
Merge "Update to use new ConnectivityManager API."
Eran Messeri [Tue, 22 Jan 2019 18:36:56 +0000 (18:36 +0000)]
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
Pavel Grafov [Wed, 5 Dec 2018 11:25:51 +0000 (11:25 +0000)]
Update to use new ConnectivityManager API.
Bug:
77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1
Kiyoung Kim [Thu, 20 Dec 2018 09:36:27 +0000 (18:36 +0900)]
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
Bill Yi [Sat, 19 Jan 2019 22:46:03 +0000 (14:46 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e60e0d2291 -s ours
am skip reason: subject contains skip directive
Change-Id: I27259294f2360a745415605afaf325e37fe8c565
Bill Yi [Sat, 19 Jan 2019 19:34:19 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
Fan Zhang [Fri, 18 Jan 2019 01:26:39 +0000 (17:26 -0800)]
Merge "Add Dynamic tiles" am:
15bf05f6fd
am:
0d8ea3bfce
Change-Id: I081d9ce4018e6fb7d899655ddeb96c5a9c3eb649
Fan Zhang [Fri, 18 Jan 2019 01:08:14 +0000 (17:08 -0800)]
Merge "Add Dynamic tiles"
am:
15bf05f6fd
Change-Id: I0998725bc59e1d4f9b8afff388c2a9a3c680423c
Fan Zhang [Fri, 18 Jan 2019 00:47:52 +0000 (00:47 +0000)]
Merge "Add Dynamic tiles"
jin.dong [Thu, 20 Dec 2018 03:48:20 +0000 (11:48 +0800)]
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
Anton Hansson [Mon, 14 Jan 2019 16:15:32 +0000 (08:15 -0800)]
Merge "Make the Settings permission a required module" am:
480b56e3d6
am:
bc79e6e6f3
Change-Id: I775d8b3a84ef2c1eccfb8d590e97ee1dcbeedf5d
Anton Hansson [Mon, 14 Jan 2019 16:11:21 +0000 (08:11 -0800)]
Merge "Make the Settings permission a required module"
am:
480b56e3d6
Change-Id: I2316d82bb50778e6f524d708cc1711dcd69f1f9d
Anton Hansson [Mon, 14 Jan 2019 16:03:16 +0000 (16:03 +0000)]
Merge "Make the Settings permission a required module"
Anton Hansson [Mon, 10 Dec 2018 17:03:29 +0000 (17:03 +0000)]
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
16322a027142db6eaae885dea06b825382bb76b8)
Anton Hansson [Mon, 14 Jan 2019 09:50:56 +0000 (01:50 -0800)]
Merge "Move Settings app to /product" am:
0a399bf543
am:
297fe94122
Change-Id: I6f04ca71a2a4af1cfb4bc07019f991bc845fd8e6
Anton Hansson [Mon, 14 Jan 2019 09:22:53 +0000 (01:22 -0800)]
Merge "Move Settings app to /product"
am:
0a399bf543
Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d
Anton Hansson [Mon, 14 Jan 2019 09:06:25 +0000 (09:06 +0000)]
Merge "Move Settings app to /product"
Bill Yi [Mon, 14 Jan 2019 00:39:54 +0000 (16:39 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e18f734843 -s ours
am skip reason: subject contains skip directive
Change-Id: I7eeb038b93fe47601b946e74d0309e6923e048d5
Bill Yi [Sun, 13 Jan 2019 07:00:35 +0000 (23:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
Anton Hansson [Mon, 10 Dec 2018 18:14:48 +0000 (18:14 +0000)]
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
f109282c8ea955bfc72a025c7068930c67c38681)
Nathan Harold [Tue, 8 Jan 2019 01:31:14 +0000 (17:31 -0800)]
Merge "Fix BandMode Dialog Crash on Open due to Style" am:
7588ef1518
am:
7aacdc2c13
Change-Id: I50588e17f07d89daa3a989a72080a4fe695b4729
Nathan Harold [Tue, 8 Jan 2019 01:16:52 +0000 (17:16 -0800)]
Merge "Fix BandMode Dialog Crash on Open due to Style"
am:
7588ef1518
Change-Id: I0dd365652f4deac7b69b181317b0dd86610400a7
Nathan Harold [Tue, 8 Jan 2019 00:18:21 +0000 (00:18 +0000)]
Merge "Fix BandMode Dialog Crash on Open due to Style"
Ruchi Kandoi [Fri, 4 Jan 2019 22:07:48 +0000 (14:07 -0800)]
Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am:
6827785e52
am:
39845367ab
Change-Id: Ia7fc968221a6eb314a9ee384e0dd84d3aa0e84b4
Ruchi Kandoi [Fri, 4 Jan 2019 21:58:22 +0000 (13:58 -0800)]
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
am:
6827785e52
Change-Id: I7c71bad831892bf9a853ca5d4777e42c1b3a9171
Treehugger Robot [Fri, 4 Jan 2019 21:49:14 +0000 (21:49 +0000)]
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
Nathan Harold [Thu, 3 Jan 2019 04:39:06 +0000 (20:39 -0800)]
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
Bill Yi [Sat, 29 Dec 2018 02:03:18 +0000 (18:03 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9e39db9d62 -s ours
Change-Id: I7fee4d617fe40d725dbd8bee03e138b95fb3cb9c
Bill Yi [Fri, 28 Dec 2018 21:41:40 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
Pengquan Meng [Thu, 27 Dec 2018 23:55:34 +0000 (15:55 -0800)]
Merge "Add PreferenceChangeListener to ApnSettings" am:
66d28c3e37
am:
9745ec5421
Change-Id: I6a6021f131f568b51fb491248d71e4ccbcdc49ef
Pengquan Meng [Thu, 27 Dec 2018 23:51:21 +0000 (15:51 -0800)]
Merge "Add PreferenceChangeListener to ApnSettings"
am:
66d28c3e37
Change-Id: Ideef529174f7b8b89f5668f7c9366cea090df68f
Pengquan Meng [Thu, 27 Dec 2018 23:36:18 +0000 (23:36 +0000)]
Merge "Add PreferenceChangeListener to ApnSettings"
Lei Yu [Thu, 27 Dec 2018 21:49:35 +0000 (13:49 -0800)]
[automerger skipped] Merge "Update color-check-baseline.xml" am:
81cb8a2612 -s ours
am:
3461bd0644 -s ours
Change-Id: I6e510de1b75e2656e4f82727e2a9911f3e32d8d7
Lei Yu [Thu, 27 Dec 2018 21:45:22 +0000 (13:45 -0800)]
[automerger skipped] Merge "Update color-check-baseline.xml"
am:
81cb8a2612 -s ours
Change-Id: Id047f4c0964dc1f38ebf4c1afc46796c9c793ea1
Lei Yu [Thu, 27 Dec 2018 21:35:31 +0000 (21:35 +0000)]
Merge "Update color-check-baseline.xml"
Pengquan Meng [Thu, 27 Dec 2018 21:22:55 +0000 (13:22 -0800)]
Add PreferenceChangeListener to ApnSettings
The PreferenceChangeListener was removed from aosp/779634, when the
selected apn is changed, the result is not saved to the database.
In this CL, we add the PreferenceChangeListener back.
Bug:
121229775
Test: build & manual test
Change-Id: Ief1a2e05c072e5eff8060731b044c19878d346be
Bill Yi [Sat, 22 Dec 2018 01:21:21 +0000 (17:21 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
05cf17a925 -s ours
Change-Id: I2c59a155b3d113099069840a08da8d90f8d1543c
Bill Yi [Sat, 22 Dec 2018 00:07:42 +0000 (16:07 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
Lei Yu [Fri, 21 Dec 2018 22:12:26 +0000 (14:12 -0800)]
Update color-check-baseline.xml
Since these colors are already fixed in internal master(ag/
4164571).
This CL only update the baseline and won't merge down.
Change-Id: I19dbca351fb786b9dbbb84bf7f50ccc0347bd0cf
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes:
110960820
Test: repohook
Jack Yu [Fri, 21 Dec 2018 03:13:21 +0000 (19:13 -0800)]
Merge "Moved data settings to phone" am:
bcd6a7db39
am:
67475a5c66
Change-Id: I5ae8d51ffbdfa41c0cfacd49a2d10524f6abdd25
Jack Yu [Fri, 21 Dec 2018 03:01:06 +0000 (19:01 -0800)]
Merge "Moved data settings to phone"
am:
bcd6a7db39
Change-Id: I8fde45278c4a5db14f986ea87ab2bfa15b7507ab
Jack Yu [Fri, 21 Dec 2018 02:29:43 +0000 (02:29 +0000)]
Merge "Moved data settings to phone"
Calvin Pan [Fri, 21 Dec 2018 02:22:01 +0000 (18:22 -0800)]
Merge "Rename SIM_APN_LIST to SIM_APN_URI" am:
d594716359
am:
a49da46d96
Change-Id: Ifa3dd2166fadd7c4fce234adedd6db3df3fcf577
Calvin Pan [Fri, 21 Dec 2018 01:48:19 +0000 (17:48 -0800)]
Merge "Rename SIM_APN_LIST to SIM_APN_URI"
am:
d594716359
Change-Id: If8708a4d84fd8dce4c7e66507320cd35369331b2
Calvin Pan [Fri, 21 Dec 2018 01:31:44 +0000 (01:31 +0000)]
Merge "Rename SIM_APN_LIST to SIM_APN_URI"
Jack Yu [Thu, 13 Dec 2018 19:51:20 +0000 (11:51 -0800)]
Moved data settings to phone
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.
Test: Telephony sanity tests + unit tests
Bug:
73659459
Merged-In: If11a6eff057a18b4aa97addbb348537bd3194e1a
Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a
(cherry picked from commit
50972ed89e9871d73ee8722bcde458170084ba08)
Inseob Kim [Thu, 20 Dec 2018 09:42:16 +0000 (01:42 -0800)]
Merge "Remove unused system properties" am:
fd0426d438
am:
c3eb0887b0
Change-Id: If0837ac203b720b57868c1e6bbb64b05f7f8ffbf
Inseob Kim [Thu, 20 Dec 2018 09:37:03 +0000 (01:37 -0800)]
Merge "Remove unused system properties"
am:
fd0426d438
Change-Id: I6f33268a640fb14ec8e9cd2fc5acec94ac25697d
Treehugger Robot [Thu, 20 Dec 2018 09:24:39 +0000 (09:24 +0000)]
Merge "Remove unused system properties"
calvinpan [Thu, 20 Dec 2018 03:35:17 +0000 (11:35 +0800)]
Rename SIM_APN_LIST to SIM_APN_URI
In Telephony SIM_APN_LIST had been rename to SIM_APN_URI.
Bug:
120031619
Test: Build pass.
Change-Id: I203c765c7ba6ee468f76dbfdb84b50c787ac8dbe
Inseob Kim [Wed, 19 Dec 2018 03:05:22 +0000 (12:05 +0900)]
Remove unused system properties
Properties ro.config.license_path and ro.config.manual_path are not set
from anywhere but only from a test.
Bug: N/A
Test: mma -j
Change-Id: I651405f3a201f5129bf37059e96e7bcc5efa73bf
Merged-In: I651405f3a201f5129bf37059e96e7bcc5efa73bf
Ruchi Kandoi [Mon, 22 Oct 2018 23:58:37 +0000 (16:58 -0700)]
Add support for FEATURE_NFC_ANDROID_BEAM
Test: Check if app shows the Toggle switch
Bug:
117519147
Change-Id: I395653dd977dc9b149fc343b533d15df71affaf1
Josh Hou [Mon, 17 Dec 2018 08:25:12 +0000 (00:25 -0800)]
Merge "Refine APN fetching logic" am:
765621670b
am:
74069bc022
Change-Id: I372d73a75a7dd2077e39dfc29c66b29b1a3ace65
OSDN Git Service
