OSDN Git Service
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit
c3cab8ecb84051abac144aaa0f94ee9276c89aab)
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
Fix wrong position of cursor in IccLockSettings
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/
67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Treehugger Robot [Fri, 13 Oct 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Refresh payment preference while resume"
Treehugger Robot [Fri, 13 Oct 2017 21:45:18 +0000 (21:45 +0000)]
Merge "There is no NEXT button in find sensor screen of fingerprint."
Daniel Nishi [Fri, 13 Oct 2017 17:52:58 +0000 (17:52 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly"
Cai, Min1 [Wed, 11 Oct 2017 08:31:22 +0000 (17:31 +0900)]
Refresh payment preference while resume
To show latest payment service list on Tap&pay menu.
Test: install payment service and go back to Tap&pay menu
Bug:
67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
Treehugger Robot [Wed, 11 Oct 2017 20:45:19 +0000 (20:45 +0000)]
Merge "Move SettingsRobolectricTestRunner to testutils."
Fan Zhang [Wed, 11 Oct 2017 19:22:56 +0000 (12:22 -0700)]
Move SettingsRobolectricTestRunner to testutils.
Change-Id: Ia0017983b844cabafc10478adf4839f5755f514c
Merged-In: I6612b1f26404587301c534c8ba60e39d59d6c840
Fixes:
67688380
Test: robotests
Li YanJia [Mon, 6 Feb 2017 06:50:56 +0000 (14:50 +0800)]
Fix PrivateVolumeSettings be launched repeatedly
Symptom:
After manually pull out the removable sd card or usb storage in
StorageSettings screen, it automatically moves to
PrivateVolumeSettings screen. This time, launching
PrivateVolumeSettings Activity is triggered six times and end-user
has to press back key six times to exit PrivateVolumeSettings
screen.
Root cause:
When sd card is pulled out, StorageSettings got three state change
event (UNMOUNTED, BAD_REMOVAL and onDiskDestroyed) through
StorageEventListener that triggers launching PrivateVolumeSettings
screen. In addition StorageSettings register the listener two
times, then StorageSettings receives six event in total.
Therefore, PrivateVolumeSettings screen is launched six times.
Solution:
Skip launching PrivateVolumeSettings if it's already triggered.
And removed the duplicated listener registration.
Bug:
67612903
Change-Id: Iabef51677a393977b7be29fc54aa050434213500
edgar.huang [Fri, 22 Sep 2017 09:31:38 +0000 (17:31 +0800)]
There is no NEXT button in find sensor screen of fingerprint.
Precondition: set the Font size and Display size to largest
Enter into the find sensor screen and the NEXT button is missing.
Test: manual - Enter into the find sensor screen -
and can find the NEXT button after sliding the screen.
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I8f6219ab22abad98111f016d633bf100dc3222ce
Ben Schwartz [Mon, 2 Oct 2017 22:16:15 +0000 (18:16 -0400)]
Add a developer option for controlling DNS over TLS
Bug:
63449024
Test: Manual. Appears to work.
Change-Id: I1b354c5cbfe761432235284232d993f028a8e18d
Treehugger Robot [Mon, 2 Oct 2017 17:56:02 +0000 (17:56 +0000)]
Merge "Avoid NullPointerException when updating preference intents"
Carsten Hauge [Mon, 7 Jul 2014 07:36:07 +0000 (09:36 +0200)]
Avoid NullPointerException when updating preference intents
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.
Fixes:
67075850
Test: manual - go to Settings > Users & accounts and tap an account.
Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
Treehugger Robot [Fri, 29 Sep 2017 06:45:30 +0000 (06:45 +0000)]
Merge "Fix wrong format in AndroidManifest.xml"
songkailun [Fri, 29 Sep 2017 01:42:05 +0000 (09:42 +0800)]
Fix wrong format in AndroidManifest.xml
N/A
Change-Id: Idf3b9c22e65d15013f5e3e2f5a1e9719d35ede3a
Signed-off-by: songkailun <songkailun@xiaomi.com>
Treehugger Robot [Tue, 26 Sep 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
Lei Yang [Mon, 13 Feb 2017 02:39:29 +0000 (10:39 +0800)]
Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled
"Set up Wi-Fi NFC Tag" dialog cannot be scrolled and "Show password"
is not displayed when setting Font size and Display size to Largest.
To fix this issue, ScrollView should be added.
Fixes:
66936807
Test: manual - long tap a connected Wi-Fi AP and
tap "Write to NFC tag".
Change-Id: I3edcf3c2b9db47319e18405066bcb835b064b690
Treehugger Robot [Tue, 26 Sep 2017 01:12:30 +0000 (01:12 +0000)]
Merge "Remove unnecessary core-oj library"
Colin Cross [Sun, 24 Sep 2017 05:09:31 +0000 (22:09 -0700)]
Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.
Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
Doris Ling [Thu, 21 Sep 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
tiansiming [Tue, 19 Sep 2017 10:16:19 +0000 (18:16 +0800)]
Fix NPE crash in UsageAccessDetails
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java
Bug:https://issuetracker.google.com/issues/
65872768
Test:As explained in the link above
Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Doris Ling [Thu, 14 Sep 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Default apps settings disappear when switching to secondary user"
Treehugger Robot [Thu, 14 Sep 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
Treehugger Robot [Thu, 14 Sep 2017 08:10:25 +0000 (08:10 +0000)]
Merge changes Icd3d09aa,I4b070964
* changes:
Include IPv6 DNS servers in wifi details
Separate multiple DNS addresses with newlines.
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
Include IPv6 DNS servers in wifi details
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug:
65037256
Bug:
65467586
Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit
9adc5887490953c6d239a634d6ebca4cd3081dc6)
Sundeep Ghuman [Tue, 29 Aug 2017 00:20:02 +0000 (17:20 -0700)]
Separate multiple DNS addresses with newlines.
Bug: b/
65037256
Bug:
65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit
2716e841be8e8bda36c451e1ba9651b37eead560)
Peng Du [Thu, 3 Aug 2017 11:35:53 +0000 (19:35 +0800)]
Default apps settings disappear when switching to secondary user
When switching to a secondary user, Settings will disable all extra
categories that aren't configured in SETTINGS_FOR_RESTRICTED.
As the result, Default apps settings disappear.
To fix this issue, AdvancedAppsActivity class of Default apps settings
should be added to SETTINGS_FOR_RESTRICTED.
Fixes:
65616610
Test: manual - switch to a secondary user
and go to Settings > Apps & notifications.
Change-Id: Ie9f3b1d215e2e43bf25b8dd2971f86bd60e94d04
edgar.huang [Wed, 13 Sep 2017 03:04:01 +0000 (11:04 +0800)]
Don't need to authenticate fingerprint when the fingerprint list is empty.
Enter into the fingerprint list screen and can authenticate fingerprint still when the list is empty.
Test: manual - enrolling some fingerprints and remove all fingerprintd, touch the fingerprint touch panel and no response.
Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]
Merge "Add ims registration status"
Treehugger Robot [Mon, 11 Sep 2017 17:21:07 +0000 (17:21 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug:
65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
Treehugger Robot [Fri, 8 Sep 2017 09:56:31 +0000 (09:56 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug:
28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
daqi [Tue, 5 Sep 2017 01:53:05 +0000 (09:53 +0800)]
Fix TrustedCredentialsSettings NPE
[Cause of Defect]
TrustedCredentialsSettings#mKeyChainConnectionByProfileId is get/set by
more than one thread. Main thread would set it in onDestroy method, and
AsyncTask would get and set in the doInBackground method. So
mKeyChainConnectionByProfileId.get(profileId) would get null after
onDestroy method get called.
Bug: N/A
Test: Debugger to simulate concurrency
Change-Id: I0664d1e9b88b079855354ce0e6fe014a98a22327
Signed-off-by: daqi <daqi@xiaomi.com>
Treehugger Robot [Wed, 6 Sep 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
edgar.huang [Thu, 31 Aug 2017 03:22:25 +0000 (11:22 +0800)]
Settings is crashed high probability when doing follow steps
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
Treehugger Robot [Thu, 31 Aug 2017 22:16:52 +0000 (22:16 +0000)]
Merge "Fix errorprone build"
Maurice Lam [Thu, 31 Aug 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
Colin Cross [Tue, 29 Aug 2017 19:14:54 +0000 (12:14 -0700)]
Fix errorprone build
Fixes:
packages/apps/Settings/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java:95: error: [MockitoCast] A bug in Mockito will cause this test to fail at runtime with a ClassCastException
when(mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);
^
(see http://errorprone.info/bugpattern/MockitoCast)
Did you mean 'when((Object) mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);'?
packages/apps/Settings/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java:195: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testBindViewElements_appSearchResult() {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
Bug:
64489631
Test: m -j RUN_ERROR_PRONE=true javac-check
Merged-In: I79477f331ae447d2505a1519da09886bf07ba1a2
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I8fd30fc741927de3f6527aca6d98d8851ef23794
liming.wang [Thu, 27 Oct 2016 02:00:34 +0000 (10:00 +0800)]
Fix Settings crashes after tapping "Learn more" in fingerprint page
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
Fixes:
64322876
Test: manual - go to Settings > Security & Location > Fingerprint
and then tap "Learn more"
Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
Treehugger Robot [Tue, 22 Aug 2017 21:02:03 +0000 (21:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
Treehugger Robot [Tue, 22 Aug 2017 19:52:21 +0000 (19:52 +0000)]
Merge changes from topic "Read dun APNs from apn db"
* changes:
Change empty apn type in user entered APN to non-read-only types.
Check for null mReadOnlyApnTypes.
Disallow adding/editing dun APNs unless allowed by carrier.
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
Change empty apn type in user entered APN to non-read-only types.
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug:
38186417
Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.
Test: none
Bug:
62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
Amit Mahajan [Wed, 10 May 2017 05:31:13 +0000 (22:31 -0700)]
Disallow adding/editing dun APNs unless allowed by carrier.
Test: WIP
Bug:
38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
Bill Yi [Thu, 17 Aug 2017 23:57:35 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
Nick Desaulniers [Wed, 16 Aug 2017 18:34:27 +0000 (18:34 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am:
33046b4ec2 -s ours
Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9
Treehugger Robot [Wed, 16 Aug 2017 18:00:44 +0000 (18:00 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
Nick Desaulniers [Sun, 30 Oct 2016 21:48:08 +0000 (14:48 -0700)]
DeviceInfoSettingsTest: test parsing llvm kernel
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.
Bug:
32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
mingliang.x.lei [Wed, 9 Aug 2017 18:34:07 +0000 (18:34 +0000)]
Merge "Fix memory leak in Bluetooth settings"
am:
5a652c0286
Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
Treehugger Robot [Wed, 9 Aug 2017 18:27:43 +0000 (18:27 +0000)]
Merge "Fix memory leak in Bluetooth settings"
Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
am:
5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
Maurice Lam [Tue, 8 Aug 2017 22:02:20 +0000 (22:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
Bill Yi [Sun, 6 Aug 2017 17:38:44 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jian Zhou [Thu, 27 Jul 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am:
41b4d908bb
Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
Ryusuke Sawa [Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Show Error dialog when WPS is interrupted"
am:
fd7dec5d4a
Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
Treehugger Robot [Thu, 27 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
Treehugger Robot [Thu, 27 Jul 2017 18:15:35 +0000 (18:15 +0000)]
Merge "Show Error dialog when WPS is interrupted"
Ryusuke Sawa [Fri, 19 Jul 2013 05:32:19 +0000 (14:32 +0900)]
Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.
Bug:
29883134
Test: manual - tap WPS Push Button and turn Airplane mode on
Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
Pengfei Zhao [Tue, 18 Jul 2017 20:31:57 +0000 (20:31 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning"
am:
3a2e327741
Change-Id: Ic25c64da40b1accb9dce63a63462acd01664e054
Treehugger Robot [Tue, 18 Jul 2017 20:24:35 +0000 (20:24 +0000)]
Merge "Fix Settings crash when setting only decimal point to data usage warning"
Pengfei Zhao [Fri, 10 Feb 2017 09:32:53 +0000 (17:32 +0800)]
Fix Settings crash when setting only decimal point to data usage warning
Settings app crashes when only decimal point (".") is set to
data usage warning because it is not a valid number.
To fix this issue, the decimal point should be converted to 0.
Fixes:
63787824
Test: manual - go to Settings > Data usage > Mobile data usage and then
set only decimal point to data usage warning.
Change-Id: Iefb6a035ba6f17b8e0c89f79dbd397e2356fb19c
xiaocheng.x.wang [Mon, 17 Jul 2017 21:46:47 +0000 (21:46 +0000)]
Merge "Black screen appears after tapping the back key"
am:
abcd256842
Change-Id: I2deeaed21b9452933e25a324e420c1cacfcfb395
Treehugger Robot [Mon, 17 Jul 2017 21:39:29 +0000 (21:39 +0000)]
Merge "Black screen appears after tapping the back key"
Nobuyuki Nakamura [Mon, 22 Feb 2016 08:32:31 +0000 (17:32 +0900)]
Show help string when onEnrollmentHelp() is called
The help string is not shown when onEnrollmentHelp() is called
between onEnrollmentProgressChange() and mTouchAgainRunnable#run().
To fix this issue, showError() should be called.
Bug:
30274453
Test: manual - start enrolling fingerprint and move finger fast on the sensor
Change-Id: Ie604532940e40cca66dc54b56c3cb4b828a07987
mingliang.x.lei [Wed, 9 Mar 2016 06:30:55 +0000 (14:30 +0800)]
Fix memory leak in Bluetooth settings
Bluetooth settings screen has two categories. Each category should call
removeAll() method to unregister a callback from CachedBluetoothDevice.
But the method is not called for mPairedDevicesCategory.
Bug:
30004142
Test: manual - connect to Bluetooth device and then
open and close Bluetooth settings screen repeatedly
Change-Id: I5a72994473ee2bb5fc3ad00176d9a930b4839099
kun.tang [Mon, 10 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
am:
3cbae7d6b5
Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
Treehugger Robot [Mon, 10 Jul 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Fix Phone crash when rorate screen on SimStatus."
kun.tang [Sat, 8 Jul 2017 03:09:02 +0000 (11:09 +0800)]
Fix Phone crash when rorate screen on SimStatus.
When rorate screen on SimStatus, Fragment not attached to Activity, phone crash.
Solution: use mRes to getString
Test: build
07-07 13:20:27.237 696 696 E AndroidRuntime: Process: com.android.phone, PID: 696
07-07 13:20:27.237 696 696 E AndroidRuntime: java.lang.IllegalStateException: Fragment SimStatus{
d1e4bb3} not attached to Activity
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.Fragment.getResources(Fragment.java:861)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus.updateSignalStrength(SimStatus.java:359)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.settings.deviceinfo.SimStatus$4.onSignalStrengthsChanged(SimStatus.java:444)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.telephony.PhoneStateListener$1.handleMessage(PhoneStateListener.java:334)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
07-07 13:20:27.237 696 696 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6558)
07-07 13:20:27.237 696 696 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
07-07 13:20:27.237 696 696 E AndroidRuntime: at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygot
Change-Id: Ife8f2e3ed8c4fe6db0fe784a43910768ff3ff4d1
daqi [Mon, 26 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
am:
31a2f413f8 -s ours
Change-Id: Ibaba7d54ce393f2212df3f05b8929b445ccba912
Treehugger Robot [Mon, 26 Jun 2017 21:13:47 +0000 (21:13 +0000)]
Merge "Fix PremiumSmsAccess memory leak"
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
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: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
Marie Janssen [Fri, 23 Jun 2017 00:22:23 +0000 (00:22 +0000)]
Bluetooth: Make notifications local-only
am:
1138397336
Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
Marie Janssen [Fri, 16 Jun 2017 00:19:36 +0000 (17:19 -0700)]
Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.
Test: connect to watch and pair a device
Bug:
34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit
426903d155a0e9089666736e784d498e6a016845)
Marie Janssen [Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Bluetooth: Make notifications local-only" am:
348a7085fa
am:
620fe71520
Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
Marie Janssen [Thu, 22 Jun 2017 15:37:28 +0000 (15:37 +0000)]
Merge "Bluetooth: Make notifications local-only"
am:
348a7085fa
Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df
Treehugger Robot [Thu, 22 Jun 2017 15:31:37 +0000 (15:31 +0000)]
Merge "Bluetooth: Make notifications local-only"
Bill Yi [Wed, 21 Jun 2017 20:21:34 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am:
ae5a31e55c -s ours
Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
Bill Yi [Wed, 21 Jun 2017 04:36:56 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfada62fcc0224d6bffd354ab140fd5300a5a8a3
Auto-generated-cl: translation import
jackqdyulei [Tue, 20 Jun 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
am:
05777a7918
Change-Id: I2c12178379cfed44d6007533f420c7611038bfed
TreeHugger Robot [Tue, 20 Jun 2017 22:35:57 +0000 (22:35 +0000)]
Merge "Hide wifi and bt in battery settings" into oc-dev
jackqdyulei [Tue, 20 Jun 2017 20:34:51 +0000 (13:34 -0700)]
Hide wifi and bt in battery settings
Hide them in app usage list but don't smear them
Bug:
62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
Marie Janssen [Fri, 16 Jun 2017 00:19:36 +0000 (17:19 -0700)]
Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.
Test: connect to watch and pair a device
Bug:
34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
Daniel Nishi [Mon, 19 Jun 2017 17:55:30 +0000 (17:55 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
am:
4743423a82
Change-Id: Ia2c95906c0c526f426deaa243ff075ce70bee1fc
Alison Cichowlas [Mon, 19 Jun 2017 17:49:20 +0000 (17:49 +0000)]
Merge "Notification settings update." into oc-dev
am:
e5493808fd
Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a
Daniel Nishi [Mon, 19 Jun 2017 17:45:30 +0000 (17:45 +0000)]
Merge "Add more sane multi-profile app attribution." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 17:34:39 +0000 (17:34 +0000)]
Merge "Notification settings update." into oc-dev
gaochong [Mon, 19 Jun 2017 17:12:41 +0000 (17:12 +0000)]
Merge "Fix Screen Magnification recursive draw" am:
4e7846fbe4
am:
db233c6e88
Change-Id: If8a23a012e0b7a82dc0c6a7d349a15310b4eb43e
gaochong [Mon, 19 Jun 2017 17:07:37 +0000 (17:07 +0000)]
Merge "Fix Screen Magnification recursive draw"
am:
4e7846fbe4
Change-Id: I4890ba0d33dd9245f1393c59c77531f0597ff6ff
Treehugger Robot [Mon, 19 Jun 2017 17:00:07 +0000 (17:00 +0000)]
Merge "Fix Screen Magnification recursive draw"
Alison Cichowlas [Fri, 16 Jun 2017 17:56:56 +0000 (13:56 -0400)]
Notification settings update.
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug:
62705435
Test: make RunSettingsRoboTests; manual verification
Merged-In: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29