Commit Graph

3704 Commits

Author SHA1 Message Date
Chris Wren
5a860604e3 Merge "Enable experimentation on notification snooze options" into oc-mr1-dev am: 9cb14a0c95
am: 4706c262fa

Change-Id: Ic99064fcb8a51b8d66ce5b55e4e2da52cbc1557b
2017-10-03 00:28:16 +00:00
Chris Wren
4706c262fa Merge "Enable experimentation on notification snooze options" into oc-mr1-dev
am: 9cb14a0c95

Change-Id: Ia54ca5b12479f22c9bef54b1f488bcb74e15423f
2017-10-03 00:19:02 +00:00
Chris Wren
e901a7e0ed Enable experimentation on notification snooze options
Bug: 67003813
Test: runtest systemui

Change-Id: Id46ef3938e2edc633f64cec7b66e10d80c9a0bff
2017-10-02 17:38:16 -04:00
Kenny Guy
c4db5cae4f Fix typo in Settings.BOOT_COUNT
Change-Id: Idc274d55e4c26584288455f8087776d0a8b930e5
Test: make docs
2017-09-21 12:00:41 +01:00
Christine Franks
0321346f38 Handle night display state when timezone changes
Bug: 64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London

Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5
(cherry picked from commit 2ce862c3ed)
2017-09-20 03:35:49 +00:00
Christine Franks
1cdb151ef7 Merge "Handle night display state when timezone changes" into oc-mr1-dev
am: 1276f357d3

Change-Id: I96cc0161eb092f2a965efbff4a417bc992493625
2017-09-20 00:43:12 +00:00
Christine Franks
1276f357d3 Merge "Handle night display state when timezone changes" into oc-mr1-dev 2017-09-20 00:23:28 +00:00
Christine Franks
2ce862c3ed Handle night display state when timezone changes
Bug: 64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London

Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5
2017-09-19 14:37:26 -07:00
TreeHugger Robot
8c8ded0e11 Merge "Add a backup manager constants secure settings." 2017-09-15 01:38:50 +00:00
Tim Zheng
cc1e76a4b3 Add a backup manager constants secure settings.
This change add one secure settings which is a key value list consisting
of 7 individual settings; it also provides a class to get these settings
and use the default values specified in default.xml file when the settings
are missing.

This is the first part of a 2 part change. A subsequent change will use
these settings in backup service manger for setting up backup frequency.

Test: This change builds. Manual tests will be included in part 2 of the
change.
Bug: 63351792
Change-Id: I62baddbf3e0b96af6b7de3dfdeac3479e5b3ded8
2017-09-14 16:32:21 -07:00
Dave Friedman
7c8f03477b Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed am: d1412d3d60 am: b8ae843a20
am: 8be86f28f8

Change-Id: I0a64f06c0771f88f1cbe09d46f48fca35529ea42
2017-09-14 22:04:25 +00:00
Dave Friedman
8be86f28f8 Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed am: d1412d3d60
am: b8ae843a20

Change-Id: Ic72fdc1f0833b8ebcd6d789cc2023266287dc341
2017-09-14 02:22:00 +00:00
Sundeep Ghuman
bd89855f46 Merge "Change score cache eviction time to settings value." into oc-mr1-dev
am: 2193f912f3

Change-Id: Ifec764594fcaa858a81d52896cc501d56dcf20e0
2017-09-14 02:18:01 +00:00
Dave Friedman
b8ae843a20 Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed
am: d1412d3d60

Change-Id: Ia63b719e65f0d82f7aa65fd4a74a442ffa27190d
2017-09-14 00:11:57 +00:00
Dave Friedman
d1412d3d60 Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718
am: 4b3a4b58ed

Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af
2017-09-13 23:42:48 +00:00
Sundeep Ghuman
1e98151104 Change score cache eviction time to settings value.
Reduce default eviction time from intended 24 hours (erroneously input
as 24 days) to 20 minutes.

Bug: b/63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
Merged-In: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
2017-09-13 13:23:55 -07:00
Dave Friedman
4b3a4b58ed Docs: Updating ANDROID_ID information to reflect Android O changes.
Bug: 38270718

Test: Verified on local build.

Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
2017-09-13 08:47:46 -07:00
Chad Brubaker
e7454950f6 Merge "Expand and expose Lockdown global action" 2017-09-11 22:04:07 +00:00
Chad Brubaker
4f28f0de37 Expand and expose Lockdown global action
This action puts the phone into the state where it can only be unlocked
via the user's primary knowledge factor. In the future this can also
evict keys and otherwise secure the device beyond the norm in a sketchy
situation.

This is currently controlled Settings.Secure.LOCKDOWN_IN_POWER_MENU, it
can be enabled for testing via
`adb shell settings put secure lockdown_in_power_menu 1`

Bug: 37221346
Test: Manual
Change-Id: I6197fadf655e5298cab1ab95153c316b87f3b718
2017-09-07 16:14:46 -07:00
Daniel Nishi
1b1b7827c8 Merge "Flag storage settings cache invalidation time." into oc-mr1-dev am: b53b925f68
am: a5288e7ae6

Change-Id: I4f82aba1446d3fa959ed8055b7d9fb97cfc69b64
2017-09-07 15:34:47 +00:00
Daniel Nishi
a5288e7ae6 Merge "Flag storage settings cache invalidation time." into oc-mr1-dev
am: b53b925f68

Change-Id: Ib6706048900ee19a72ad412da091a9278adb42c5
2017-09-07 15:15:04 +00:00
Sundeep Ghuman
9bb85d3c4d Change score cache eviction time to settings value.
Reduce default eviction time from intended 24 hours (erroneously input
as 24 days) to 20 minutes.

Bug: b/63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
2017-09-06 18:09:35 -07:00
Daniel Nishi
b53b925f68 Merge "Flag storage settings cache invalidation time." into oc-mr1-dev 2017-09-06 23:07:13 +00:00
Chad Brubaker
15d584448a Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev am: 102f564165
am: 47be923fd5

Change-Id: I326983ec4699570b5de91824cca08028e95d1914
2017-09-06 18:45:11 +00:00
Chad Brubaker
47be923fd5 Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev
am: 102f564165

Change-Id: Iaec41b49ab0fd6d312efc08b05b3cff0b12c4401
2017-09-06 18:30:18 +00:00
Chad Brubaker
a6170b86ba Allow Instant Apps to access send_action_app_error
Bug: 65294464
Test: Manual
Change-Id: I81964362b5109037315064ebc4610adb0edc151f
2017-09-01 14:48:46 -07:00
Julia Reynolds
8c6fe753dd Merge "Add more functionality to channel groups" 2017-09-01 12:49:49 +00:00
Lei Yu
b868891671 Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev am: 67594c6f54
am: 04e7d1fa20

Change-Id: I9b4a60017a5e2273e572d90929d269e31352b5a0
2017-09-01 01:24:17 +00:00
Lei Yu
04e7d1fa20 Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev
am: 67594c6f54

Change-Id: Ifbb83939c2c2c30048fe43b2092b2afe4c3b234c
2017-09-01 01:01:47 +00:00
Lei Yu
67594c6f54 Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev 2017-09-01 00:54:01 +00:00
jackqdyulei
8443dd0e76 Hook up AOD knobs to Settings.Global
This cl creates AlwaysOnDisplayPolicy, which get values for the
following knobs(go/aod-experiments) from Settings.Global:
1. screen_brightness_array
2. dimming_scrim_array
3. prox_screen_off_delay
4. prox_cooldown_trigger
5. prox_cooldown_period

Also update code to make sure AlwaysOnDisplayPolicy is used
everywhere.

Bug: 64899561
Test: runtest -x AlwaysOnDisplayPolicyTest

Change-Id: I2e83ff980771e67177e4964bd83aa68b2bdca65f
2017-08-31 13:20:04 -07:00
Julia Reynolds
005c8b9098 Add more functionality to channel groups
Description, blocking, links to/from the app

Test: cts, runtest systemui-notification
Bug: 63927402
Change-Id: Icc8caf319651f9ac2d622fb54110270c89bdff61
2017-08-30 17:07:58 -04:00
Jeff Sharkey
595987e619 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev am: f31cf45e82
am: 8ab5f7f324

Change-Id: Ica24924ff8e5c95bd14114fb0a1d82c21a7d30d4
2017-08-30 19:27:49 +00:00
Jeff Sharkey
8ab5f7f324 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
am: f31cf45e82

Change-Id: Ia6c6d5893d841f21d181363dc01f77efa6579a8f
2017-08-30 19:14:21 +00:00
Jeff Sharkey
f4de294297 Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI.  For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.

Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.

Thorough testing to verify behavior.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
2017-08-30 10:01:10 -06:00
xulicheng
97ebbf871a Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81 am: 489f2c2c48 am: 848cde3beb
am: 4755a1a41a

Change-Id: Ibe36de21f657b42ab8c7c27d53d0298d7275d09b
2017-08-28 20:40:49 +00:00
xulicheng
4755a1a41a Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81 am: 489f2c2c48
am: 848cde3beb

Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2
2017-08-28 20:21:45 +00:00
xulicheng
489f2c2c48 Merge "Ensure the generation is not changed before put value to cache"
am: 11ae580f81

Change-Id: I5bf2c557f6f46f1455204761a9045b8b90d7ea32
2017-08-28 19:58:06 +00:00
Daniel Nishi
5782b5c52d Flag storage settings cache invalidation time.
Fixes: 37923463
Test: Settings Robotest

Change-Id: Ibd4c90dde6d378621ab5e8a96408cd3f496c1f6e
2017-08-25 10:37:32 -07:00
xulicheng
a5db9b42ea Ensure the generation is not changed before put value to cache
It may get old value from mValues, so check the generation
is not changed before update cache

Bug: https://issuetracker.google.com/issues/64995655
Test: Build
Change-Id: Ia7ae18baa269d0590e36f186e2f14b0bfbab3504
Signed-off-by: xulicheng <xulicheng@xiaomi.com>
2017-08-25 01:22:24 +00:00
Baligh Uddin
230c78cec5 DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
Bug: 64864568

This reverts commit fd35d7c0a2, reversing
changes made to 07a21754f4.
2017-08-19 15:49:05 -07:00
Guliz Tuncay
db18b5520f Merge "Multi-user aware TSMS" 2017-08-14 17:52:48 +00:00
Guliz Tuncay
06a2624049 Multi-user aware TSMS
Currently, spell checker component can process requests only from the
foreground user's account and requests from background users are always
ignored. However, in order to fully realize the multi-user nature of
Android, most system services will need to truly support multiple users
simultaneously. With multi-user aware TSMS implemented, apps from
background users (other accounts and their work profiles) can also run
their spell checking jobs in batch, without the external device user
having to switch accounts for the spell checker to be enabled in that
account.

Bug: 63041121
Test: Manually as follows
Setup: Create a work profile and a secondary user
1. adb shell pm create-user --profileOf 0 --managed workprofile (userId 10)
2. adb shell am create-user seconrdaryuser1 (userId 11)
3. Build SampleSpellCheckerService, which is by default
    direct-boot unaware.
     package name: com.example.android.samplespellcheckerservice
     APK name: SampleSpellCheckerService_DBUnaware.apk
4. Also build a custom SampleSpellCheckerService by explicitly
     making '.SampleSpellCheckerService' direct-boot aware.
     package name: com.example.android.samplespellcheckerservice2
     APK name: SampleSpellCheckerService_DBAware.apk
5. adb install --user 0 -r SampleSpellCheckerService_DBUnaware.apk
6. adb install --user 10 -r SampleSpellCheckerService_DBUnaware.apk
7. adb install --user 11 -r SampleSpellCheckerService_DBUnaware.apk
8. adb install --user 0 -r SampleSpellCheckerService_DBAware.apk
9. adb install --user 10 -r SampleSpellCheckerService_DBAware.apk
10. adb install --user 11 -r SampleSpellCheckerService_DBAware.apk
11. make -j ApiDemos
12. adb install --user 0 -r $ANDROID_PRODUCT_OUT/data/app/ApiDemos/ApiDemos.apk
13. adb install --user 10 -r $ANDROID_PRODUCT_OUT/data/app/ApiDemos/ApiDemos.apk
14. adb install --user 11 -r $ANDROID_PRODUCT_OUT/data/app/ApiDemos/ApiDemos.apk
15. Make sure AOSP Keyboard (com.android.inputmethod.latin) is installed
for all users.

Test 1: Settings correctly updated for each user (Work profile's SC is
not bound to account and can be individually updated)
0. Complete Setup
1. adb shell am start-user 0
2. adb shell am start-user 10
3. adb shell am start-user 11
4. adb shell settings put --user 0 secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
5. adb shell settings put --user 10 secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
6. adb shell settings put --user 11 secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
7. adb shell settings get --user 0 secure selected_spell_checker
         -> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
8. adb shell settings get --user 10 secure selected_spell_checker
         -> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
9. adb shell settings get --user 11 secure selected_spell_checker
         -> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
10. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
11. adb shell settings get --user 0 secure selected_spell_checker
         -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
12. Repeat 8 & 9. Results should be the same.
13. adb shell settings put --user 10 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
14. adb shell settings get --user 10 secure selected_spell_checker
         -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
15. adb shell settings get --user 0 secure selected_spell_checker
         -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
16. adb shell settings get --user 11 secure selected_spell_checker
         -> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
17. adb shell settings put --user 11 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
14. adb shell settings get --user 11 secure selected_spell_checker
         -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
14. adb shell settings get --user 0 secure selected_spell_checker
         -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
15. adb shell settings get --user 10 secure selected_spell_checker
         -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
16. adb shell am start-user 0
17. adb shell am start-user 10
18. adb shell am start-user 11
19. adb shell settings put --user 0 secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
20. adb shell settings put --user 10 secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
21. adb shell settings put --user 11 secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService

Test 2: Basic functionality works (each user can use SC when they're at
the foreground) & background connections aren't broken
0. Complete Setup
1. Open "Api Demos" app for user 0
2. Go to Views/Text/EditText
3. Focus into the first EditText then type "aaa"
4. Focus into the second EditText then type "aaa"
5. adb shell dumpsys textservices --user 0
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
6. adb shell dumpsys textservices --user 10
         -> make sure there are no active spell checker sessions.
7. adb shell dumpsys textservices --user 10
         -> make sure there are no active spell checker sessions.
8. Repeat 7-10 for the work profile (userId 10)
9. adb shell dumpsys textservices --user 10
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
10. adb shell am switch-user 11
11. Repeat 7-10 (userId 11)
12. adb shell dumpsys textservices --user 11
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
13. adb shell dumpsys textservices --user 0
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
14. adb shell dumpsys textservices --user 10
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.

Test 3: Background user can also call spell checker APIs
0. Complete Setup
1. adb shell pm install -r TestApp.apk
2. adb shell am switch-user 11
3. adb shell am start --user 11 -n com.example.gulizseray.testapp/com.example.gulizseray.testapp.MainActivity
4. adb logcat | grep spellcheckerclient
        -> Periodically calls spell checker APIs and prints results
5. adb shell dumpsys textservices --user 11
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
6. Adb shell am switch-user 0
7. adb logcat | grep spellcheckerclient
        -> Continues to periodically call SC APIs and print results
8. Open "Api Demos" app for user 0
9. Go to Views/Text/EditText
10. Focus into the first EditText then type "aaa"
11. Focus into the second EditText then type "aaa"
12. adb shell dumpsys textservices --user 0
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
13. adb shell dumpsys textservices --user 11
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.

Test 4: Package updates for all unlocked users (not just foreground user) are tracked properly (New package added/removed from owner, profile, secondary users)
0. Complete Setup
1. adb uninstall --user 0 com.example.android.samplespellcheckerservice
2. adb shell dumpsys textservices --user 0
        -> Make sure com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
        does not exist in the list
3. adb shell settings get --user 0 secure selected_spell_checker
       -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
4. adb uninstall --user 10 com.example.android.samplespellcheckerservice
5. adb shell dumpsys textservices --user 10
        -> Make sure com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
        does not exist in the list
6. adb shell settings get --user 10 secure selected_spell_checker
       -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb uninstall --user 11 com.example.android.samplespellcheckerservice
8. adb shell dumpsys textservices --user 11
        -> Make sure com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
        does not exist in the list
9. adb shell settings get --user 11 secure selected_spell_checker
       -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
10. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
11. adb shell dumpsys textservices --user 0
       -> Make sure com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
       is in the list

12. adb shell settings get --user 0 secure selected_spell_checker
       -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
13. adb install --user 10 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
14. adb shell dumpsys textservices --user 10
       -> Make sure com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
       is in the list
15. adb shell settings get --user 10 secure selected_spell_checker
       -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
16. adb install --user 11 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
17. adb shell dumpsys textservices --user 11
       -> Make sure com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
       is in the list
18. adb shell settings get --user 11 secure selected_spell_checker
       -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService

Test 5: SpellCheckerBindGroups will be cleared when the corresponding
app is killed.
0. Complete Setup
1. Open "Api Demos" app for user 0
2. Go to Views/Text/EditText
3. Focus into the first EditText then type "aaa"
4. Focus into the second EditText then type "aaa"
5. adb shell dumpsys textservices --user 0
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
6. Kill Api Demos
7. adb shell dumpsys textservices --user 0
         -> make sure there are no active spell checker sessions.
8. Repeat 1-7 for work profile (user 10)
9. adb shell am switch-user 11
10. Repeat 1-7 for secondary user (user 11)
12. adb shell pm install -r TestApp.apk
13. adb shell am start --user 11 -n com.example.gulizseray.testapp/com.example.gulizseray.testapp.MainActivity
14. adb shell dumpsys textservices --user 11
         -> make sure 'com.example.android.samplespellcheckerservice'
            is serving spell checker sessions.
15. adb shell am switch-user 0
16. adb shell am force-stop com.example.gulizseray.testapp
17. adb shell dumpsys textservices --user 11
         -> make sure there are no active spell checker sessions.
Change-Id: I06c27ef834203a21cc445dc126602c799384527b
2017-08-11 15:31:40 -07:00
Neil Fuller
39ca5b870b Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.

This is the third of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the old
constant.

Bug: 64568899
Test: None, build only
Change-Id: I75731b13ce2046556d6148aa5707cab6ed9cf9bf
(cherry picked from commit db57c03434)
2017-08-11 20:51:10 +00:00
Neil Fuller
0c94e46859 Merge "Change SystemApi as per API council feedback" 2017-08-11 20:50:32 +00:00
Neil Fuller
db57c03434 Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.

This is the third of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the old
constant.

Bug: 64568899
Test: None, build only
Change-Id: I75731b13ce2046556d6148aa5707cab6ed9cf9bf
2017-08-11 14:28:32 +01:00
Jeff Sharkey
3994a887f2 Merge "Fix handling of @removed APIs." into oc-mr1-dev am: 5cb2d64b9b
am: aff3d6cf6b

Change-Id: Idab5d726027922c66b0ecfe23c3d4f1ea9d2b7a5
2017-08-10 15:37:52 +00:00
Jeff Sharkey
5cb2d64b9b Merge "Fix handling of @removed APIs." into oc-mr1-dev 2017-08-10 15:18:58 +00:00
Tyler Gunn
8adf430f30 Merge "Enforce call log length limit on a per PhoneAccount basis."
am: 647b520a00

Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471
2017-08-09 19:03:32 +00:00
Tyler Gunn
c971bf1760 Enforce call log length limit on a per PhoneAccount basis.
Performing the auto delete based on the PhoneAccount of the new entry.
This ensures no one CS can cause the removal of entries by another.

Test: Manual
Bug: 38196259
Merged-In: I382cb62a1b2b7e482c49ece05f90fc982b797add
Change-Id: I382cb62a1b2b7e482c49ece05f90fc982b797add
2017-08-09 09:53:00 -07:00