OSDN Git Service
Maurice Lam [Tue, 27 Jun 2017 18:53:48 +0000 (18:53 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev am:
a102714c19
am:
2cc641940d
Change-Id: If6155441bff70cd30160619cdd5a61d6fe562cec
Fan Zhang [Tue, 27 Jun 2017 18:53:25 +0000 (18:53 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev am:
124232d6fa
am:
6175c9cc6a
Change-Id: I46a0308bf9d3a7aa8397d337e99bc4a09eae2f00
daqi [Tue, 27 Jun 2017 18:53:02 +0000 (18:53 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am:
31a2f413f8 -s ours am:
34fe9136c6 am:
96e566a68c
am:
49729cbd9e
Change-Id: I4805dd6c4c7e18402379ff7eaa7ffb3f6f50f1a9
Kevin Chyn [Tue, 27 Jun 2017 18:52:13 +0000 (18:52 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev am:
0e393d4163
am:
4efa54e342 -s ours
Change-Id: I11106a971c6a6950c1868e2a0a6897902117a46e
jackqdyulei [Tue, 27 Jun 2017 18:46:14 +0000 (18:46 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am:
1eb2f15339
am:
e9d1f6f1ae
Change-Id: I1b6ae16aa8899561e240c09eaaa2c89083a70b4a
TreeHugger Robot [Tue, 27 Jun 2017 18:39:31 +0000 (18:39 +0000)]
Merge "resolve merge conflicts of
758b2d4ae6 to master"
TreeHugger Robot [Tue, 27 Jun 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Show IMSI in RadioInfo."
Phil Weaver [Tue, 27 Jun 2017 15:09:33 +0000 (15:09 +0000)]
Merge "Adjust a11y shortcut settings based on UX input"
jackqdyulei [Tue, 27 Jun 2017 01:29:31 +0000 (18:29 -0700)]
resolve merge conflicts of
758b2d4ae6 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53
TreeHugger Robot [Tue, 27 Jun 2017 01:22:13 +0000 (01:22 +0000)]
Merge "Fix assist gesture settings summary"
Maurice Lam [Tue, 27 Jun 2017 01:16:16 +0000 (01:16 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev
am:
a102714c19
Change-Id: I7ac04a8bf769be782c79bd0e672c38db1bd6187b
Maurice Lam [Tue, 27 Jun 2017 01:10:09 +0000 (01:10 +0000)]
Merge "Update buttons in FP find sensor" into oc-dr1-dev
Kevin Chyn [Tue, 27 Jun 2017 00:45:26 +0000 (00:45 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider"
TreeHugger Robot [Tue, 27 Jun 2017 00:14:10 +0000 (00:14 +0000)]
Merge "resolve merge conflicts of
31a2f413f8 to master"
TreeHugger Robot [Tue, 27 Jun 2017 00:11:56 +0000 (00:11 +0000)]
Merge "Dashboard search bar polish"
Kevin Chyn [Sat, 24 Jun 2017 21:16:47 +0000 (14:16 -0700)]
Remove unnecessary functions from AssistGestureFeatureProvider
Fixes:
62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
TreeHugger Robot [Mon, 26 Jun 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Remove redundant talkback readout when rebooting device"
Fan Zhang [Mon, 26 Jun 2017 22:22:30 +0000 (22:22 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev
am:
124232d6fa
Change-Id: I0d5f9f945437312a82a9ced59988d8b653088d6c
daqi [Mon, 26 Jun 2017 22:20:53 +0000 (22:20 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am:
31a2f413f8 -s ours am:
34fe9136c6
am:
96e566a68c
Change-Id: I9bff0585afa8cf2675479356edaf40b4bc81794a
daqi [Mon, 26 Jun 2017 22:18:38 +0000 (22:18 +0000)]
Merge "Fix PremiumSmsAccess memory leak" am:
31a2f413f8 -s ours
am:
34fe9136c6
Change-Id: I01c8d25555d6a71e552137d74a0b500d79df7e87
TreeHugger Robot [Mon, 26 Jun 2017 22:08:32 +0000 (22:08 +0000)]
Merge "Update icon for language settings" into oc-dr1-dev
daqi [Mon, 26 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
am:
31a2f413f8 -s ours
Change-Id: Ibaba7d54ce393f2212df3f05b8929b445ccba912
daqi [Sat, 17 Jun 2017 07:24:44 +0000 (15:24 +0800)]
resolve merge conflicts of
31a2f413f8 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6
Andrew Sapperstein [Mon, 26 Jun 2017 21:21:19 +0000 (14:21 -0700)]
Merge commit '
e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316
Test: none
Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e
Treehugger Robot [Mon, 26 Jun 2017 21:13:47 +0000 (21:13 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
TreeHugger Robot [Mon, 26 Jun 2017 21:06:45 +0000 (21:06 +0000)]
Merge "Fix typo in metrics constants"
Kevin Chyn [Wed, 21 Jun 2017 01:33:40 +0000 (18:33 -0700)]
Fix assist gesture settings summary
Bug:
62841640
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Kevin Chyn [Mon, 26 Jun 2017 20:30:56 +0000 (20:30 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
am:
0e393d4163
Change-Id: I3bc791c4d31d78de761eda608c26450d9940f11d
jackqdyulei [Mon, 26 Jun 2017 20:30:26 +0000 (20:30 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
am:
1eb2f15339
Change-Id: I9a1e1f78b34e989a1e56a0e43bf2f40df10a35eb
TreeHugger Robot [Mon, 26 Jun 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 20:22:25 +0000 (20:22 +0000)]
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
jackqdyulei [Mon, 26 Jun 2017 20:01:22 +0000 (20:01 +0000)]
Merge "Hide misc in battery settings" into oc-dr1-dev
am:
da45ba8c9e
Change-Id: Idb9d205dec2db148c4832266716da565eaf3cf73
TreeHugger Robot [Mon, 26 Jun 2017 19:52:53 +0000 (19:52 +0000)]
Merge "Hide misc in battery settings" into oc-dr1-dev
Antony Sargent [Mon, 26 Jun 2017 19:49:16 +0000 (19:49 +0000)]
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
am:
ee55927bd4
Change-Id: Ibc1dbef4dac9d5830aee7cc1a70ccb70333d32cf
TreeHugger Robot [Mon, 26 Jun 2017 19:35:04 +0000 (19:35 +0000)]
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
Fan Zhang [Mon, 26 Jun 2017 19:13:55 +0000 (12:13 -0700)]
Fix typo in metrics constants
Change-Id: If73ca178c6f3f5544ae2f5a0cc030e307d7df8c5
Fix:
62955794
Test: robotests
Fan Zhang [Mon, 26 Jun 2017 18:37:12 +0000 (11:37 -0700)]
Update icon for language settings
Change-Id: I74691be4d2e8377640b931a3b05021129ce246d5
Fix:
37929875
Test: visual
Tony Mantler [Tue, 13 Jun 2017 20:09:25 +0000 (13:09 -0700)]
Make PreferenceController a mixin
Bug:
62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
jackqdyulei [Mon, 26 Jun 2017 17:36:05 +0000 (10:36 -0700)]
Hide misc in battery settings
Hide it in any condition:
1. both in app usage list and device usage list
2. in all targets(i.e. user, userdebug..)
Bug:
62422405
Test: RunSettingsRoboTests
Change-Id: I36bd043942ce7e2353163868bf6d86f422f8e7ee
Antony Sargent [Fri, 16 Jun 2017 20:17:39 +0000 (13:17 -0700)]
Add a rename dialog for paired Bluetooth devices
This adds an icon to the paired device details page which users can
click on to bring up a dialog for changing the display name for that
device.
We already had a dialog for changing the advertised name of the local
Bluetooth adapter that's used on the main Bluetooth settings page, so
I've made that abstract and created two new subclasses to encapsulate
the slight differences for this use case.
Bug:
62535241
Test: make RunSettingsRoboTests
Change-Id: I1c407f276e12aedf066a336e24b4ccd16d67c4df
Andrew Sapperstein [Sun, 25 Jun 2017 22:18:46 +0000 (15:18 -0700)]
Dashboard search bar polish
Various tweaks to match redlines:
- background is now grey all the time
- the search icon is aligned with the other icons
- the title text is primary colored instead of accent colored
- the background of search bar doesn't scroll anymore
Deletes a bunch of logic to add an initial view that would be
colored based on the first view. It never quite worked right.
Now it's consistent and never moves.
Bug:
37477506
Change-Id: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
Fixes:
62267378
Fixes:
62379978
Fixes:
62361213
Test: robotests
Andrew Sapperstein [Sun, 25 Jun 2017 23:14:45 +0000 (23:14 +0000)]
Remove logic for adding a search icon to action bar. am:
a2dd9978d4
am:
a7dd97a4c9
Change-Id: I4e1f2e9e792642257f538696afe8f9aca396cdbb
Andrew Sapperstein [Sun, 25 Jun 2017 23:12:44 +0000 (23:12 +0000)]
Remove logic for adding a search icon to action bar.
am:
a2dd9978d4
Change-Id: Ifbc919113e129e997d20a89069e159fc5963ee1c
Andrew Sapperstein [Sun, 25 Jun 2017 20:51:08 +0000 (13:51 -0700)]
Remove logic for adding a search icon to action bar.
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.
Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes:
62230804
Bug:
37477506
Test: robotests
Kevin Chyn [Sat, 24 Jun 2017 21:16:47 +0000 (14:16 -0700)]
Remove unnecessary functions from AssistGestureFeatureProvider
Fixes:
62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
Andrew Sapperstein [Sat, 24 Jun 2017 05:03:31 +0000 (05:03 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev am:
74a350f9c9
am:
ee3e1af182
Change-Id: Ib5cc4974d2b7d42f9518fb34bdca815da22d8bd3
Jack Yu [Sat, 24 Jun 2017 04:55:48 +0000 (04:55 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev am:
698dc94151
am:
fa283cfff1
Change-Id: I09637a7737d35354c1c8faebabdf063da78bdc33
Andrew Sapperstein [Sat, 24 Jun 2017 04:54:51 +0000 (04:54 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
am:
74a350f9c9
Change-Id: I5f90f5dc56765ab16e9bc6879fe84d3fe31ce0df
Jack Yu [Sat, 24 Jun 2017 04:47:53 +0000 (04:47 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
am:
698dc94151
Change-Id: I8df78f80b3bcadcb9c3a409cea5f75f64f76ed38
Maurice Lam [Sat, 24 Jun 2017 00:47:23 +0000 (17:47 -0700)]
Update buttons in FP find sensor
Remove the next button (so the user has to touch the sensor to
proceed), and add a skip button.
Test: cd tests/robotests && mma
Bug:
62839648
Change-Id: I555948ac2f3235e08b91f0957aa8e0ce24535c08
TreeHugger Robot [Fri, 23 Jun 2017 23:44:47 +0000 (23:44 +0000)]
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
Jack Yu [Fri, 23 Jun 2017 23:13:50 +0000 (23:13 +0000)]
Merge "Refactored area update info support" into oc-dr1-dev
Meng Wang [Fri, 23 Jun 2017 23:02:14 +0000 (16:02 -0700)]
Show IMSI in RadioInfo.
Needs to know IMSI in some carrier testing.
Test: manual
Change-Id: I020fc0806a65abfa6af43a512c814ea0aa562b88
TreeHugger Robot [Fri, 23 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Disable managed services special access screens..."
jackqdyulei [Fri, 23 Jun 2017 21:44:35 +0000 (21:44 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev am:
9463219048
am:
3829eca2d8
Change-Id: I3b6b2a38534feb99b6c795c660734093cb7bbb2e
jackqdyulei [Fri, 23 Jun 2017 21:33:02 +0000 (21:33 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev
am:
9463219048
Change-Id: Iab042eb8275c05f4a9cb6c222c3bfe3279582669
Andrew Sapperstein [Fri, 23 Jun 2017 21:32:22 +0000 (14:32 -0700)]
Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
Instead, this decision is being handled via AnomalyDetectionPolicy.
Change-Id: I5b1831c78e31e3be984dda07bcea9f0b0a25d52f
Fixes:
62871629
Test: robotests
TreeHugger Robot [Fri, 23 Jun 2017 21:28:32 +0000 (21:28 +0000)]
Merge "Change the method to get foreground time." into oc-dr1-dev
jackqdyulei [Fri, 23 Jun 2017 20:52:36 +0000 (13:52 -0700)]
Update the chargeLabel when battery level is full
Before this cl, it will show "100% - charging", which doesn't make
sense. This cl removes "- charging", and only show "100%" in this
case
Bug:
62559153
Test: RunSettingsRoboTests
Change-Id: Id124fe4098e21b4a69c4a7d3d522fa227faab65d
Maurice Lam [Fri, 23 Jun 2017 20:53:41 +0000 (20:53 +0000)]
Add fingerprint backup message am:
d793590678
am:
d396208233
Change-Id: I857fd458c046fa053000f7b41280310ce73f73f1
Maurice Lam [Fri, 23 Jun 2017 20:48:45 +0000 (20:48 +0000)]
Add fingerprint backup message
am:
d793590678
Change-Id: I431ad2491085b9bccc1b90a117a30497f4156c9e
Julia Reynolds [Wed, 21 Jun 2017 18:19:46 +0000 (14:19 -0400)]
Disable managed services special access screens...
... on low ram devices.
- Remove them from the 'Special app access' screen
- Display an error message if an app intents directly to
them
Bug:
35219985
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java,
when the device is in low ram mode and when it's not.
Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac
Maurice Lam [Thu, 22 Jun 2017 00:09:33 +0000 (17:09 -0700)]
Add fingerprint backup message
Test: Manual
Bug:
62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf
jackqdyulei [Thu, 22 Jun 2017 17:24:27 +0000 (10:24 -0700)]
Change the method to get foreground time.
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);
Bug:
62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
Fan Zhang [Fri, 23 Jun 2017 17:47:36 +0000 (17:47 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am:
e28599049e
am:
88ce094235
Change-Id: Iefc8c7173e6d375d1045a3b148ba5c0f11c426e2
Fan Zhang [Fri, 23 Jun 2017 17:34:00 +0000 (17:34 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
am:
e28599049e
Change-Id: I4ee4f15c73d8ef633704553b8147c3c3c3a02a6c
TreeHugger Robot [Fri, 23 Jun 2017 17:27:57 +0000 (17:27 +0000)]
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 13:31:23 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
6b1ff7073a -s ours am:
bbeaae705d -s ours
am:
a043cf04df -s ours
Change-Id: I335191d70ae5fe79fe7d1ea9c334ecd6d82a60e3
Bill Yi [Fri, 23 Jun 2017 13:30:51 +0000 (13:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6300674d27 -s ours
am:
995b3898c4 -s ours
Change-Id: I8be17d45e727141f2d6690a2afa02526c9eb50a0
Bill Yi [Fri, 23 Jun 2017 13:30:03 +0000 (13:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
6b1ff7073a -s ours am:
5386943cf2 -s ours
am:
16ec3c30e5 -s ours
Change-Id: I03cc46fad1b0c82b4ee4d6460f320c278a7fa250
Bill Yi [Fri, 23 Jun 2017 13:00:52 +0000 (13:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
6b1ff7073a -s ours
am:
bbeaae705d -s ours
Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824
Bill Yi [Fri, 23 Jun 2017 13:00:07 +0000 (13:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6300674d27 -s ours
Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c
Bill Yi [Fri, 23 Jun 2017 12:48:51 +0000 (12:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
6b1ff7073a -s ours
am:
5386943cf2 -s ours
Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab
Bill Yi [Fri, 23 Jun 2017 12:39:42 +0000 (12:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6b1ff7073a -s ours
Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9
TreeHugger Robot [Fri, 23 Jun 2017 12:32:31 +0000 (12:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 12:29:05 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6b1ff7073a -s ours
Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
TreeHugger Robot [Fri, 23 Jun 2017 12:23:14 +0000 (12:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 08:39:20 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 08:33:27 +0000 (01:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
daqi [Sat, 17 Jun 2017 07:24:44 +0000 (15:24 +0800)]
Fix PremiumSmsAccess memory leak
[Cause of Defect]
PremiumSmsAccess forget to invoke Session and AppStateSmsPremBridge
release method in the onDestroy callback.
And that would lead to the leak of activity context.
Test: 1. Settings - Apps - Advanced - Special access - Premium SMS access
2. adb shell dumpsys meminfo com.android.settings
3. observe activity object number
4. back to the last page
5. use AS trigger Settings gc several times
6. adb shell dumpsys meminfo com.android.settings
7. observe activity object number to check if the activity number decrease
Change-Id: I359900c16fa866fba94d187a61cf6bebbdd1ed0b
Signed-off-by: daqi <daqi@xiaomi.com>
Daniel Nishi [Fri, 23 Jun 2017 04:44:59 +0000 (04:44 +0000)]
Merge "Count cache in storage categories. am:
b22b85b593 am:
b57a71fe08" into oc-dr1-dev-plus-aosp
am:
d570ab1595
Change-Id: If3eac200a1e775165415382f5e63c50b6c65dc11
Daniel Nishi [Fri, 23 Jun 2017 04:37:22 +0000 (04:37 +0000)]
Count cache in storage categories. am:
b22b85b593 am:
5837a9b98b
am:
41400d022c
Change-Id: Iee95e7d07f0642aec5bc478c8929bb4b50d3d3ec
Android Build Merger (Role) [Fri, 23 Jun 2017 04:30:14 +0000 (04:30 +0000)]
Merge "Count cache in storage categories. am:
b22b85b593 am:
b57a71fe08" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 23 Jun 2017 04:28:49 +0000 (04:28 +0000)]
Count cache in storage categories. am:
b22b85b593
am:
5837a9b98b
Change-Id: If5107df5ea57dc782e76cd6444f38c9feaff037f
Daniel Nishi [Fri, 23 Jun 2017 04:28:43 +0000 (04:28 +0000)]
Count cache in storage categories. am:
b22b85b593
am:
b57a71fe08
Change-Id: Id280446eddddafbd7445a11ad42d1f66320b9128
Daniel Nishi [Fri, 23 Jun 2017 04:19:19 +0000 (04:19 +0000)]
Count cache in storage categories.
am:
b22b85b593
Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa
Daniel Nishi [Fri, 23 Jun 2017 04:19:16 +0000 (04:19 +0000)]
Count cache in storage categories.
am:
b22b85b593
Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99
Daniel Nishi [Fri, 23 Jun 2017 00:09:59 +0000 (17:09 -0700)]
Count cache in storage categories.
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).
Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes:
62623731
Test: Settings Unit Test
Fan Zhang [Fri, 23 Jun 2017 01:47:45 +0000 (01:47 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev am:
f964e8c3b2
am:
9f7227eb59
Change-Id: I2421dba06e793b62ed3abb2dde041b8d0e1f0d29
Fan Zhang [Fri, 23 Jun 2017 01:43:15 +0000 (01:43 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
am:
f964e8c3b2
Change-Id: I39d82c1332362c2e4f90c793a9c5ef44d297353a
TreeHugger Robot [Fri, 23 Jun 2017 01:37:45 +0000 (01:37 +0000)]
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
Marie Janssen [Fri, 23 Jun 2017 00:32:29 +0000 (00:32 +0000)]
Merge "Bluetooth: Make notifications local-only am:
1138397336 am:
493a76e087" into oc-dr1-dev-plus-aosp
am:
297ab4cbf7
Change-Id: Id5ae9b091e48fe1d903276529f37253c89c4179e
Marie Janssen [Fri, 23 Jun 2017 00:31:52 +0000 (00:31 +0000)]
Bluetooth: Make notifications local-only am:
1138397336 am:
0efa2b3427
am:
56adef485a
Change-Id: I859ca92f0f3ba63dfbe5d3beb54264c371542d9a
Android Build Merger (Role) [Fri, 23 Jun 2017 00:27:26 +0000 (00:27 +0000)]
Merge "Bluetooth: Make notifications local-only am:
1138397336 am:
493a76e087" into oc-dr1-dev-plus-aosp
Marie Janssen [Fri, 23 Jun 2017 00:26:59 +0000 (00:26 +0000)]
Bluetooth: Make notifications local-only am:
1138397336
am:
493a76e087
Change-Id: Ife7f54253c73bdff35a8ee988d51be8bd4c7ebe1
Marie Janssen [Fri, 23 Jun 2017 00:26:53 +0000 (00:26 +0000)]
Bluetooth: Make notifications local-only am:
1138397336
am:
0efa2b3427
Change-Id: I2b308d2646693280cb6e0f69106e94b481c526e3
Marie Janssen [Fri, 23 Jun 2017 00:22:24 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
Marie Janssen [Fri, 23 Jun 2017 00:22:23 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
Fan Zhang [Thu, 22 Jun 2017 22:51:54 +0000 (15:51 -0700)]
Fix presubmit test
Change-Id: I8c1f35fc76ed153080655242943fdfa9c29cf5bb
Fix:
62913954
Test: robotests
Fan Zhang [Thu, 22 Jun 2017 22:04:41 +0000 (15:04 -0700)]
Remove redundant talkback readout when rebooting device
Change-Id: I0b3bf7d0d75c4f19c234977be5caa74496c67a94
Fix:
62418304
Test: manual
OSDN Git Service
