OSDN Git Service
Takamasa Kuramitsu [Sat, 2 Mar 2019 00:52:30 +0000 (16:52 -0800)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am:
b67697cf38
am:
b496699104
Change-Id: I4ad127ad793b1c154af8536b8b989aafd283e787
Takamasa Kuramitsu [Sat, 2 Mar 2019 00:29:52 +0000 (16:29 -0800)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
am:
b67697cf38
Change-Id: Ic1a3e5d5bd2660b8ed71b0650672321480d60adb
Treehugger Robot [Fri, 1 Mar 2019 21:48:55 +0000 (21:48 +0000)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
Takamasa Kuramitsu [Fri, 1 Mar 2019 00:22:38 +0000 (00:22 +0000)]
Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
This reverts commit
1ea003e8347237e5f6a4a696aa741a32d169e620.
Fixes:
116821732
Reason for revert: blocking issue in b/
124370422 is resolved
Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b
Neil Fuller [Wed, 27 Feb 2019 19:10:27 +0000 (11:10 -0800)]
Merge "Update the timestamp used for time zone filtering" am:
51376aefc1
am:
d2b3df945c
Change-Id: Ibf0c0b2e1bedf25f8228e98bdb3644d0e090d135
Neil Fuller [Wed, 27 Feb 2019 19:01:42 +0000 (11:01 -0800)]
Merge "Update the timestamp used for time zone filtering"
am:
51376aefc1
Change-Id: I73413541d36f6caac85dd18c2f6d63adee67b95e
Treehugger Robot [Wed, 27 Feb 2019 18:45:08 +0000 (18:45 +0000)]
Merge "Update the timestamp used for time zone filtering"
Neil Fuller [Wed, 27 Feb 2019 14:58:45 +0000 (14:58 +0000)]
Update the timestamp used for time zone filtering
Update the timestamp used for time zone filtering and improve the
comment explaining what it is for.
Bug:
124756276
Test: build only
Change-Id: I2e53b1f3bd36602f8d08967e1335066d93ae05ea
Joe Onorato [Tue, 26 Feb 2019 07:00:09 +0000 (23:00 -0800)]
Merge "Add additional anomaly types." am:
64bf0a791e
am:
e709ac7a4c
Change-Id: I5b813e1357baae09566285dacb30e44169e9b16d
Joe Onorato [Tue, 26 Feb 2019 06:48:39 +0000 (22:48 -0800)]
Merge "Add additional anomaly types."
am:
64bf0a791e
Change-Id: Iebe3695669e87b3109b43becaf869c4b2f9a4b48
Xin Li [Tue, 26 Feb 2019 03:17:55 +0000 (19:17 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
am:
fc53be7b56 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia25b02f0df97306066a4f52687ab55376b8bc3bb
Xin Li [Tue, 26 Feb 2019 00:18:26 +0000 (16:18 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
am:
1994397e6a -s ours
am skip reason: subject contains skip directive
Change-Id: I5c40623742c23696457c1fedb742322c634ed1f6
Youming Ye [Mon, 25 Feb 2019 21:08:32 +0000 (13:08 -0800)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim" am:
5b3ee7afaa
am:
e3844769e6
Change-Id: Id1d2e5e9a061d844ecc69eed35b2c36d61a0a416
Treehugger Robot [Mon, 25 Feb 2019 19:53:26 +0000 (19:53 +0000)]
Merge "Add additional anomaly types."
Joe Onorato [Tue, 5 Feb 2019 01:36:23 +0000 (17:36 -0800)]
Add additional anomaly types.
Test: Treehugger
Bug:
115540658
Change-Id: I369f5bfadfe10810aa33d4127fb9ce69c9c57e7e
Xin Li [Sat, 23 Feb 2019 00:39:23 +0000 (00:39 +0000)]
Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
Youming Ye [Fri, 22 Feb 2019 22:14:11 +0000 (14:14 -0800)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
am:
5b3ee7afaa
Change-Id: Iffac84438bf43372a1ddeb4df1ef9d85c9af2a2d
Youming Ye [Fri, 22 Feb 2019 21:53:12 +0000 (21:53 +0000)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
Bill Yi [Fri, 22 Feb 2019 02:14:54 +0000 (18:14 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
02681df33f -s ours
am skip reason: subject contains skip directive
Change-Id: Ib86fee981b4acd47fa9dc91011fe8d88fd7230c8
Wenting Xiong [Wed, 28 Nov 2018 09:22:21 +0000 (18:22 +0900)]
Fix issue that the wifi calling text cannot be customized based on sim
Some carriers have requirements that the wifi calling text should be
customizable. However, the resources for the wifi calling text are
not obtained based on sim. So it cannot be customized per sim for multi
sim device. To solve this issue, obtain the resources with specified
sim.
Test: manual - Checked that the wifi calling text could be customized
based on sim.
Bug:
117257109
Change-Id: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
Merged-In: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
Bill Yi [Fri, 22 Feb 2019 00:40:33 +0000 (16:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
Xin Li [Thu, 21 Feb 2019 19:03:43 +0000 (11:03 -0800)]
DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
Bug:
120848293
Change-Id: I6eeee632ff6ee7f2d7395344a7887c44c7acd440
Kiyoung Kim [Thu, 21 Feb 2019 01:07:08 +0000 (17:07 -0800)]
Merge "Schematize Crypto system properties" am:
b837a44716
am:
a078a02c42
Change-Id: Ie498a453d85651904d98b0501d895e15cabfb317
Kiyoung Kim [Thu, 21 Feb 2019 00:34:01 +0000 (16:34 -0800)]
Merge "Schematize Crypto system properties"
am:
b837a44716
Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Xin Li [Wed, 20 Feb 2019 19:47:29 +0000 (11:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am:
d4716c1a62 -s ours
am:
92fc138524 -s ours
am skip reason: subject contains skip directive
Change-Id: I1e1a98a476c0fcda84f8d5c1d245e296b0354708
Xin Li [Wed, 20 Feb 2019 19:06:41 +0000 (11:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am:
d4716c1a62 -s ours
am skip reason: subject contains skip directive
Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9
Xin Li [Wed, 20 Feb 2019 17:29:00 +0000 (09:29 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
9d8c2cc2c6 -s ours
am:
a99376f647 -s ours
am skip reason: subject contains skip directive
Change-Id: I70f7a0afed0ff3124670ac7da3a5a4d643b07970
Xin Li [Wed, 20 Feb 2019 16:52:26 +0000 (08:52 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am:
9d8c2cc2c6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic2e84fd1810cf9eb661c2c4b4b32755821cf17e3
Xin Li [Wed, 20 Feb 2019 16:25:59 +0000 (16:25 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Xin Li [Mon, 18 Feb 2019 23:58:44 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master
Bug:
124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd
Kiyoung Kim [Tue, 22 Jan 2019 01:19:29 +0000 (10:19 +0900)]
Schematize Crypto 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: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
Merged-In: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
Xin Li [Fri, 15 Feb 2019 01:18:04 +0000 (17:18 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
am:
f6aad2aee8 -s ours
am skip reason: subject contains skip directive
Change-Id: I4bf7e0d090e49c1273ca1ad81bffe26825e34e47
Xin Li [Thu, 14 Feb 2019 22:41:06 +0000 (14:41 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am:
d61c2adf09 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia83108724808a1bb96ed25b0607545bda5abb7b9
Xin Li [Thu, 14 Feb 2019 22:11:39 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
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"
Xin Li [Tue, 12 Feb 2019 22:54:28 +0000 (14:54 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug:
124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
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"
android-build-team Robot [Sat, 9 Feb 2019 02:23:26 +0000 (02:23 +0000)]
Snap for
5180536 from
c103b546d2e33aacd8187a6bf54b28efa325ffbe to pi-platform-release
Change-Id: Ice12b1967a41a792bb4e1816d0fe07bc61328788
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
OSDN Git Service
