OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge "Add ACCESS_FINE_LOCATION to permissions"
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

5 years agoMerge "Add ACCESS_FINE_LOCATION to permissions"
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"

5 years agoMerge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
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

5 years agoMerge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""

5 years agoRevert "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

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Wed, 13 Feb 2019 03:25:31 +0000 (19:25 -0800)]
Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile"
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

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support entitlement check in DSDS"

5 years agoMerge "Schematize ADB system properties"
Kiyoung Kim [Wed, 13 Feb 2019 02:06:33 +0000 (18:06 -0800)]
Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"

5 years agoMerge "Schematize ADB system properties"
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"

5 years agoSupport entitlement check in DSDS
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

5 years agoMerge "Schematize Display system properties"
Kiyoung Kim [Tue, 12 Feb 2019 03:13:51 +0000 (19:13 -0800)]
Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0

5 years agoSchematize ADB system properties
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

5 years agoMerge "Schematize Display system properties"
Treehugger Robot [Tue, 12 Feb 2019 02:50:08 +0000 (02:50 +0000)]
Merge "Schematize Display system properties"

5 years agoAdd ACCESS_FINE_LOCATION to permissions
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

5 years agoMerge "Update the Hearing Aids Strings"
Stanley Tng [Tue, 5 Feb 2019 21:05:41 +0000 (13:05 -0800)]
Merge "Update the Hearing Aids Strings"
am: 3afa2a7acb

Change-Id: I5310642f04558d961aa82df933791b08d883d92e

5 years agoMerge "Update the Hearing Aids Strings"
Treehugger Robot [Tue, 5 Feb 2019 20:20:51 +0000 (20:20 +0000)]
Merge "Update the Hearing Aids Strings"

5 years agoUpdate 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

5 years agoMerge "Update to use new ConnectivityManager API."
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

5 years agoMerge "Update to use new ConnectivityManager API."
Pavel Grafov [Mon, 28 Jan 2019 20:15:49 +0000 (20:15 +0000)]
Merge "Update to use new ConnectivityManager API."

5 years agoUpdate 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

5 years agoMerge "Add Enterprise owners for Enterprise settings"
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

5 years agoMerge "Add Enterprise owners for Enterprise settings"
Treehugger Robot [Thu, 24 Jan 2019 22:56:27 +0000 (22:56 +0000)]
Merge "Add Enterprise owners for Enterprise settings"

5 years agoMerge "Revert "Update to use new ConnectivityManager API.""
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

5 years agoMerge "Revert "Update to use new ConnectivityManager API.""
Dan Albert [Thu, 24 Jan 2019 21:08:46 +0000 (21:08 +0000)]
Merge "Revert "Update to use new ConnectivityManager API.""

5 years agoRevert "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

5 years agoMerge "Update to use new ConnectivityManager API."
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

5 years agoMerge "Update to use new ConnectivityManager API."
Pavel Grafov [Thu, 24 Jan 2019 17:34:55 +0000 (17:34 +0000)]
Merge "Update to use new ConnectivityManager API."

5 years agoAdd Enterprise owners for Enterprise settings
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

5 years agoUpdate to use new ConnectivityManager API.
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

5 years agoSchematize Display system properties
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

5 years agoMerge "Add Dynamic tiles"
Fan Zhang [Fri, 18 Jan 2019 01:08:14 +0000 (17:08 -0800)]
Merge "Add Dynamic tiles"
am: 15bf05f6fd

Change-Id: I0998725bc59e1d4f9b8afff388c2a9a3c680423c

5 years agoMerge "Add Dynamic tiles"
Fan Zhang [Fri, 18 Jan 2019 00:47:52 +0000 (00:47 +0000)]
Merge "Add Dynamic tiles"

5 years agoAdd 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

5 years agoMerge "Make the Settings permission a required module"
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

5 years agoMerge "Make the Settings permission a required module"
Anton Hansson [Mon, 14 Jan 2019 16:03:16 +0000 (16:03 +0000)]
Merge "Make the Settings permission a required module"

5 years agoMake 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)

5 years agoMerge "Move Settings app to /product"
Anton Hansson [Mon, 14 Jan 2019 09:22:53 +0000 (01:22 -0800)]
Merge "Move Settings app to /product"
am: 0a399bf543

Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d

5 years agoMerge "Move Settings app to /product"
Anton Hansson [Mon, 14 Jan 2019 09:06:25 +0000 (09:06 +0000)]
Merge "Move Settings app to /product"

5 years agoMove Settings app to /product
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)

5 years agoMerge "Fix BandMode Dialog Crash on Open due to Style"
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

5 years agoMerge "Fix BandMode Dialog Crash on Open due to Style"
Nathan Harold [Tue, 8 Jan 2019 00:18:21 +0000 (00:18 +0000)]
Merge "Fix BandMode Dialog Crash on Open due to Style"

5 years agoMerge "Add support for FEATURE_NFC_ANDROID_BEAM"
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

5 years agoMerge "Add support for FEATURE_NFC_ANDROID_BEAM"
Treehugger Robot [Fri, 4 Jan 2019 21:49:14 +0000 (21:49 +0000)]
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"

5 years agoFix BandMode Dialog Crash on Open due to Style
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

5 years agoMerge "Add PreferenceChangeListener to ApnSettings"
Pengquan Meng [Thu, 27 Dec 2018 23:51:21 +0000 (15:51 -0800)]
Merge "Add PreferenceChangeListener to ApnSettings"
am: 66d28c3e37

Change-Id: Ideef529174f7b8b89f5668f7c9366cea090df68f

5 years agoMerge "Add PreferenceChangeListener to ApnSettings"
Pengquan Meng [Thu, 27 Dec 2018 23:36:18 +0000 (23:36 +0000)]
Merge "Add PreferenceChangeListener to ApnSettings"

5 years ago[automerger skipped] Merge "Update color-check-baseline.xml"
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

5 years agoMerge "Update color-check-baseline.xml"
Lei Yu [Thu, 27 Dec 2018 21:35:31 +0000 (21:35 +0000)]
Merge "Update color-check-baseline.xml"

5 years agoAdd PreferenceChangeListener to ApnSettings
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

5 years agoUpdate color-check-baseline.xml
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

5 years agoMerge "Moved data settings to phone"
Jack Yu [Fri, 21 Dec 2018 03:01:06 +0000 (19:01 -0800)]
Merge "Moved data settings to phone"
am: bcd6a7db39

Change-Id: I8fde45278c4a5db14f986ea87ab2bfa15b7507ab

5 years agoMerge "Moved data settings to phone"
Jack Yu [Fri, 21 Dec 2018 02:29:43 +0000 (02:29 +0000)]
Merge "Moved data settings to phone"

5 years agoMerge "Rename SIM_APN_LIST to SIM_APN_URI"
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

5 years agoMerge "Rename SIM_APN_LIST to SIM_APN_URI"
Calvin Pan [Fri, 21 Dec 2018 01:31:44 +0000 (01:31 +0000)]
Merge "Rename SIM_APN_LIST to SIM_APN_URI"

5 years agoMoved data settings to phone
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)

5 years agoMerge "Remove unused system properties"
Inseob Kim [Thu, 20 Dec 2018 09:37:03 +0000 (01:37 -0800)]
Merge "Remove unused system properties"
am: fd0426d438

Change-Id: I6f33268a640fb14ec8e9cd2fc5acec94ac25697d

5 years agoMerge "Remove unused system properties"
Treehugger Robot [Thu, 20 Dec 2018 09:24:39 +0000 (09:24 +0000)]
Merge "Remove unused system properties"

5 years agoRename SIM_APN_LIST to SIM_APN_URI
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

5 years agoRemove unused system properties
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

5 years agoAdd support for FEATURE_NFC_ANDROID_BEAM
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

5 years agoMerge "Refine APN fetching logic"
Josh Hou [Mon, 17 Dec 2018 08:16:01 +0000 (00:16 -0800)]
Merge "Refine APN fetching logic"
am: 765621670b

Change-Id: Ib0a1dd0b3f944d5a98b71555a48aadacfb228543

5 years agoMerge "Refine APN fetching logic"
Treehugger Robot [Mon, 17 Dec 2018 08:03:04 +0000 (08:03 +0000)]
Merge "Refine APN fetching logic"

5 years agoRefine APN fetching logic
Josh Hou [Fri, 23 Nov 2018 01:57:20 +0000 (09:57 +0800)]
Refine APN fetching logic

APN fetching logic has been encapsulated in URL_SIM_APN_LIST API in
TelephonyProvider

Bug: 115709816
Test: Live network test
Change-Id: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
Merged-In: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b

5 years agoRevert "Revert "Schematize vold system properties""
Inseob Kim [Mon, 10 Dec 2018 07:05:20 +0000 (07:05 +0000)]
Revert "Revert "Schematize vold system properties""

This reverts commit 49e81e0eeac13b1edcd4c8f51c48dafae6336d11.

Reason for revert: Fixed breakage

Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3
(cherry picked from commit 8346eb5ccc29f3ffe41132a06a4e7e17fb58ca19)

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
Xin Li [Thu, 13 Dec 2018 21:09:45 +0000 (13:09 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
am: 889a8a3757  -s ours

Change-Id: Ide998fc70c7beb72b1bcf878783a5429268d1aeb

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
Xin Li [Thu, 13 Dec 2018 19:24:06 +0000 (11:24 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 419086d8b3  -s ours

Change-Id: I620bd09f7331acdb7a6a8377cb02d4ccea4293f8

5 years agoMerge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
Treehugger Robot [Thu, 13 Dec 2018 05:45:20 +0000 (05:45 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"

5 years agoDO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Xin Li [Tue, 11 Dec 2018 22:19:45 +0000 (14:19 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1

5 years agoMerge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp...
TreeHugger Robot [Tue, 11 Dec 2018 21:49:26 +0000 (21:49 +0000)]
Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master

5 years ago[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
Inseob Kim [Tue, 11 Dec 2018 11:26:07 +0000 (03:26 -0800)]
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
am: cc24a22da9  -s ours

Change-Id: I19f28ff740c8cf3bb0ec1d68cef80563998154f2

5 years agoMerge "Revert "Revert "Schematize vold system properties"""
Treehugger Robot [Tue, 11 Dec 2018 11:04:01 +0000 (11:04 +0000)]
Merge "Revert "Revert "Schematize vold system properties"""

5 years agoDO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Xin Li [Mon, 10 Dec 2018 20:43:10 +0000 (12:43 -0800)]
DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534
Change-Id: I4993ed4cbd133e995e950298c65ad57c73c9a5f3

5 years agoRevert "Revert "Schematize vold system properties""
Inseob Kim [Mon, 10 Dec 2018 07:05:20 +0000 (07:05 +0000)]
Revert "Revert "Schematize vold system properties""

This reverts commit 49e81e0eeac13b1edcd4c8f51c48dafae6336d11.

Reason for revert: Fixed breakage

Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54

5 years agoMerge "Revert "Schematize vold system properties""
Anthony Stange [Fri, 7 Dec 2018 12:30:15 +0000 (04:30 -0800)]
Merge "Revert "Schematize vold system properties""
am: 94ef16b6e3

Change-Id: If9a59cfa4939e3ef2cdc7c50e0151c33c58b24aa

5 years agoMerge "Revert "Schematize vold system properties""
Anthony Stange [Fri, 7 Dec 2018 12:04:56 +0000 (12:04 +0000)]
Merge "Revert "Schematize vold system properties""

5 years agoRevert "Schematize vold system properties"
Anthony Stange [Fri, 7 Dec 2018 11:44:10 +0000 (11:44 +0000)]
Revert "Schematize vold system properties"

This reverts commit e6baedd917e041576c04687cf20d8d56dd2980fc.

Reason for revert: Breaking aosp_master build

Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b

5 years agoMerge "Schematize vold system properties"
Inseob Kim [Fri, 7 Dec 2018 02:14:00 +0000 (18:14 -0800)]
Merge "Schematize vold system properties"
am: 8cf17f7234

Change-Id: I6d9782dfc2cd54f6620c226d37ca3e81dc19647f

5 years agoMerge "Schematize vold system properties"
Treehugger Robot [Fri, 7 Dec 2018 01:46:45 +0000 (01:46 +0000)]
Merge "Schematize vold system properties"

5 years agoMerge "address API council feedbacks for Telephony.Carriers"
Chen Xu [Fri, 7 Dec 2018 00:19:11 +0000 (16:19 -0800)]
Merge "address API council feedbacks for Telephony.Carriers"
am: 71f9fe4dfa

Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3

5 years agoMerge "address API council feedbacks for Telephony.Carriers"
Chen Xu [Thu, 6 Dec 2018 21:45:47 +0000 (21:45 +0000)]
Merge "address API council feedbacks for Telephony.Carriers"

5 years agoMerge "Make migrate option menu invisible when src volume is not mounted"
Fan Zhang [Tue, 4 Dec 2018 18:01:10 +0000 (10:01 -0800)]
Merge "Make migrate option menu invisible when src volume is not mounted"
am: 6db9f21256

Change-Id: Ie4ca0c854de854172a0eccf4e56ec86a8e18d71c

5 years agoMerge "Make migrate option menu invisible when src volume is not mounted"
Fan Zhang [Tue, 4 Dec 2018 17:33:33 +0000 (17:33 +0000)]
Merge "Make migrate option menu invisible when src volume is not mounted"

5 years agoaddress API council feedbacks for Telephony.Carriers
chen xu [Wed, 28 Nov 2018 08:22:42 +0000 (00:22 -0800)]
address API council feedbacks for Telephony.Carriers

Bug: 118296421
Test: telephony unit test
Change-Id: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Merged-in: Idf8bcad4fe9d765a73563e9b0c1c659175835447

5 years agoMerge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Bill Yi [Thu, 29 Nov 2018 02:34:54 +0000 (18:34 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: I120adda515fd4891b6b9b68e93cef5555951bacc

5 years agoMerge "Track move of timezone classes to libcore.timezone"
Neil Fuller [Mon, 26 Nov 2018 23:27:52 +0000 (15:27 -0800)]
Merge "Track move of timezone classes to libcore.timezone"
am: 3ddcb6a90a

Change-Id: Id7db6339cf9c5f886be9c8ba80b47e15783a4ea3

5 years agoMerge "Track move of timezone classes to libcore.timezone"
Neil Fuller [Mon, 26 Nov 2018 23:04:33 +0000 (23:04 +0000)]
Merge "Track move of timezone classes to libcore.timezone"

5 years agoMerge "Display a toast to notify user that Preset APN setting cannot be viewed"
Youming Ye [Mon, 26 Nov 2018 21:38:30 +0000 (13:38 -0800)]
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"
am: a995cb334b

Change-Id: If2bb27e7e9452ebcaab1d421adc07259b4b3b31c

5 years agoMerge "Display a toast to notify user that Preset APN setting cannot be viewed"
Youming Ye [Mon, 26 Nov 2018 21:14:14 +0000 (21:14 +0000)]
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"

5 years agoTrack move of timezone classes to libcore.timezone
Neil Fuller [Fri, 16 Nov 2018 21:23:33 +0000 (21:23 +0000)]
Track move of timezone classes to libcore.timezone

Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Merged-In: I920411dfa7e000a0da9678826a035e0461211619
Change-Id: I920411dfa7e000a0da9678826a035e0461211619
(cherry picked from commit 1e1961a5b30dd93560bff2301b95e6a99a603cba)

5 years agoDisplay a toast to notify user that Preset APN setting cannot be viewed
taiki tsutsumi [Fri, 29 Jun 2018 05:21:39 +0000 (14:21 +0900)]
Display a toast to notify user that Preset APN setting cannot be viewed

When KEY_HIDE_PRESET_APN_DETAILS_BOOL is set to true, Preset APN setting
is hidden. When user taps Preset APN, a toast should be shown to inform
that user cannot view the APN.

Test: manual - check Preset APN setting details are hidden
Bug: 115453290
Depends-On: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
Change-Id: I0078b3492ae87a4297f24871b8bea1579e6a79af

5 years agoMerge "Remove ShadowLibcoreTimeZoneNames"
Maurice Lam [Wed, 21 Nov 2018 15:44:39 +0000 (07:44 -0800)]
Merge "Remove ShadowLibcoreTimeZoneNames"
am: 45f8352422

Change-Id: I65b07e67025ad0dfaa85fc1c873e695d69ff0a9c

5 years agoMerge "Remove ShadowLibcoreTimeZoneNames"
Treehugger Robot [Wed, 21 Nov 2018 15:17:51 +0000 (15:17 +0000)]
Merge "Remove ShadowLibcoreTimeZoneNames"

5 years agoRemove ShadowLibcoreTimeZoneNames
Maurice Lam [Tue, 20 Nov 2018 23:01:22 +0000 (15:01 -0800)]
Remove ShadowLibcoreTimeZoneNames

Bug: 119829838
Test: Treehugger

(cherry picked from commit cc2cf5ba5a8ffa1eb95b71534f256046e429f9ea)

Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c

5 years agoSchematize vold system properties
Inseob Kim [Thu, 8 Nov 2018 03:44:47 +0000 (12:44 +0900)]
Schematize vold 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: Id2a696c621015d46015d5de0e7aef987e9e01b54
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54

5 years agoMerge "Allow StubVolume to be browseable in Settings"
Risan [Tue, 13 Nov 2018 19:45:08 +0000 (11:45 -0800)]
Merge "Allow StubVolume to be browseable in Settings"
am: 8f516adef7

Change-Id: Idddb5b90367bbb5c1f1a5146fdd7b1fc01cf0cf9

5 years agoMerge "Allow StubVolume to be browseable in Settings"
Treehugger Robot [Tue, 13 Nov 2018 19:20:38 +0000 (19:20 +0000)]
Merge "Allow StubVolume to be browseable in Settings"

5 years agoMerge "Remove the feature flag and dead code for the old time zone picker"
Neil Fuller [Tue, 13 Nov 2018 09:50:08 +0000 (01:50 -0800)]
Merge "Remove the feature flag and dead code for the old time zone picker"
am: 6bb4b5ca43

Change-Id: If338977d818193950ed428b70ed6d6a3aa87082b

5 years agoMerge "Remove the feature flag and dead code for the old time zone picker"
Neil Fuller [Tue, 13 Nov 2018 09:33:16 +0000 (09:33 +0000)]
Merge "Remove the feature flag and dead code for the old time zone picker"