Bill Yi
a043cf04df
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a
-s ours
...
am: bbeaae705d
-s ours
Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824
2017-06-23 13:00:52 +00:00
Bill Yi
995b3898c4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 6300674d27
-s ours
Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c
2017-06-23 13:00:07 +00:00
Bill Yi
16ec3c30e5
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a
-s ours
...
am: 5386943cf2
-s ours
Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab
2017-06-23 12:48:51 +00:00
Bill Yi
bbeaae705d
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
-s ours
Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9
2017-06-23 12:39:42 +00:00
TreeHugger Robot
6300674d27
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-23 12:32:32 +00:00
Bill Yi
5386943cf2
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
-s ours
Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
2017-06-23 12:29:05 +00:00
TreeHugger Robot
6b1ff7073a
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56
Import translations. DO NOT MERGE
...
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
Bill Yi
0695fc5d2b
Import translations. DO NOT MERGE
...
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
2017-06-23 01:33:27 -07:00
daqi
b279330c0a
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 >
2017-06-23 14:17:49 +08:00
Daniel Nishi
f9b3997a71
Merge "Count cache in storage categories. am: b22b85b593
am: b57a71fe08" into oc-dr1-dev-plus-aosp
...
am: d570ab1595
Change-Id: If3eac200a1e775165415382f5e63c50b6c65dc11
2017-06-23 04:44:59 +00:00
Daniel Nishi
c758c52ab0
Count cache in storage categories. am: b22b85b593
am: 5837a9b98b
...
am: 41400d022c
Change-Id: Iee95e7d07f0642aec5bc478c8929bb4b50d3d3ec
2017-06-23 04:37:22 +00:00
Android Build Merger (Role)
d570ab1595
Merge "Count cache in storage categories. am: b22b85b593
am: b57a71fe08" into oc-dr1-dev-plus-aosp
2017-06-23 04:30:21 +00:00
Daniel Nishi
41400d022c
Count cache in storage categories. am: b22b85b593
...
am: 5837a9b98b
Change-Id: If5107df5ea57dc782e76cd6444f38c9feaff037f
2017-06-23 04:28:49 +00:00
Daniel Nishi
1b1d779ed4
Count cache in storage categories. am: b22b85b593
...
am: b57a71fe08
Change-Id: Id280446eddddafbd7445a11ad42d1f66320b9128
2017-06-23 04:28:43 +00:00
Daniel Nishi
5837a9b98b
Count cache in storage categories.
...
am: b22b85b593
Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa
2017-06-23 04:19:19 +00:00
Daniel Nishi
b57a71fe08
Count cache in storage categories.
...
am: b22b85b593
Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99
2017-06-23 04:19:16 +00:00
Daniel Nishi
b22b85b593
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
2017-06-22 19:08:48 -07:00
Fan Zhang
9ef5f21b8a
Merge "Load regulatory info from /data/misc" into oc-dr1-dev am: f964e8c3b2
...
am: 9f7227eb59
Change-Id: I2421dba06e793b62ed3abb2dde041b8d0e1f0d29
2017-06-23 01:47:45 +00:00
Fan Zhang
9f7227eb59
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
...
am: f964e8c3b2
Change-Id: I39d82c1332362c2e4f90c793a9c5ef44d297353a
2017-06-23 01:43:15 +00:00
TreeHugger Robot
f964e8c3b2
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
2017-06-23 01:37:47 +00:00
Marie Janssen
c65f852b3e
Merge "Bluetooth: Make notifications local-only am: 1138397336
am: 493a76e087" into oc-dr1-dev-plus-aosp
...
am: 297ab4cbf7
Change-Id: Id5ae9b091e48fe1d903276529f37253c89c4179e
2017-06-23 00:32:29 +00:00
Marie Janssen
0088711037
Bluetooth: Make notifications local-only am: 1138397336
am: 0efa2b3427
...
am: 56adef485a
Change-Id: I859ca92f0f3ba63dfbe5d3beb54264c371542d9a
2017-06-23 00:31:52 +00:00
Android Build Merger (Role)
297ab4cbf7
Merge "Bluetooth: Make notifications local-only am: 1138397336
am: 493a76e087" into oc-dr1-dev-plus-aosp
2017-06-23 00:27:29 +00:00
Marie Janssen
c514cd9483
Bluetooth: Make notifications local-only am: 1138397336
...
am: 493a76e087
Change-Id: Ife7f54253c73bdff35a8ee988d51be8bd4c7ebe1
2017-06-23 00:26:59 +00:00
Marie Janssen
56adef485a
Bluetooth: Make notifications local-only am: 1138397336
...
am: 0efa2b3427
Change-Id: I2b308d2646693280cb6e0f69106e94b481c526e3
2017-06-23 00:26:53 +00:00
Marie Janssen
493a76e087
Bluetooth: Make notifications local-only
...
am: 1138397336
Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
2017-06-23 00:22:24 +00:00
Marie Janssen
0efa2b3427
Bluetooth: Make notifications local-only
...
am: 1138397336
Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
2017-06-23 00:22:23 +00:00
Fan Zhang
aedcd8b519
Fix presubmit test
...
Change-Id: I8c1f35fc76ed153080655242943fdfa9c29cf5bb
Fix: 62913954
Test: robotests
2017-06-22 15:51:54 -07:00
Fan Zhang
49534b765e
Remove redundant talkback readout when rebooting device
...
Change-Id: I0b3bf7d0d75c4f19c234977be5caa74496c67a94
Fix: 62418304
Test: manual
2017-06-22 15:04:41 -07:00
Maurice Lam
9534677b9e
Merge "Tint suggestion icons" into oc-dr1-dev am: c1ab582fae
...
am: a1130d5d12
Change-Id: Ia355e3fb4026afae6f8582053cc07e1fb9728a93
2017-06-22 21:58:54 +00:00
Maurice Lam
a1130d5d12
Merge "Tint suggestion icons" into oc-dr1-dev
...
am: c1ab582fae
Change-Id: I8ad6d1c3ccd3c759981472cb7119dbb50dc90e99
2017-06-22 21:44:22 +00:00
Maurice Lam
554c95fbb1
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c
...
am: 15bcab49f7
Change-Id: Ib5cbaaa4c7bcfce89ed491e5ab02fd3069549efc
2017-06-22 21:36:47 +00:00
Maurice Lam
71dfd08b97
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev am: e1eae4f05f
...
am: 6d33cabb0f
Change-Id: I3c2517cab313b9f3bf4411bb02de8455ffdb0e66
2017-06-22 21:35:36 +00:00
Doris Ling
296bdda5df
Merge "Update summary for Recent Apps." into oc-dr1-dev am: d7fc071f48
...
am: dc361053a0
Change-Id: Ibd4dbb2d883a16d3d0811b15dbda9825178d5833
2017-06-22 21:34:40 +00:00
TreeHugger Robot
c1ab582fae
Merge "Tint suggestion icons" into oc-dr1-dev
2017-06-22 21:33:42 +00:00
Fan Zhang
1bc7ac3bfa
Load regulatory info from /data/misc
...
Bug: 62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc
2017-06-22 20:13:21 +00:00
Fan Zhang
86542ec1f6
Add a flag to enable/disable new device suggestion
...
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix: 62907886
Test: make RunSettingsRoboTests
2017-06-22 20:03:09 +00:00
Maurice Lam
15bcab49f7
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
...
am: cf3130338c
Change-Id: I5ee371963f73c8f645618a12949f545c2f88ca82
2017-06-22 20:02:48 +00:00
TreeHugger Robot
cf3130338c
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
2017-06-22 19:58:51 +00:00
Maurice Lam
6d33cabb0f
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
...
am: e1eae4f05f
Change-Id: I4ef2d7373d80c95c1df60ee8af9dcae2e3ac61b6
2017-06-22 19:58:02 +00:00
Doris Ling
dc361053a0
Merge "Update summary for Recent Apps." into oc-dr1-dev
...
am: d7fc071f48
Change-Id: I076f239380ffd7883e1907d1f409d47127483cdc
2017-06-22 19:57:20 +00:00
TreeHugger Robot
03849d1484
Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"
2017-06-22 19:49:35 +00:00
Maurice Lam
e1eae4f05f
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
2017-06-22 19:48:12 +00:00
TreeHugger Robot
d7fc071f48
Merge "Update summary for Recent Apps." into oc-dr1-dev
2017-06-22 19:39:10 +00:00
TreeHugger Robot
176506e54c
Merge "Catch invalid extra when launching help trampoline."
2017-06-22 19:23:45 +00:00
TreeHugger Robot
21e6b40a0f
Merge "Move Apps & notifications -> App permissions into Advanced."
2017-06-22 19:23:21 +00:00
Salvador Martinez
bbb5ed60bf
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev am: ed66c5fcdf
...
am: 23888a246b
Change-Id: I7f82ff69a26028721b6d510b1350191654c84c05
2017-06-22 18:50:40 +00:00
Salvador Martinez
23888a246b
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
...
am: ed66c5fcdf
Change-Id: I54f1e94106a2ac984a7f736706e4c70b5db9b584
2017-06-22 18:47:11 +00:00
TreeHugger Robot
ed66c5fcdf
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
2017-06-22 18:42:16 +00:00