git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Carsten Hauge [Mon, 2 Oct 2017 18:03:40 +0000 (18:03 +0000)]

Merge "Avoid NullPointerException when updating preference intents"
am: c4b0fa5858

Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f

commit | commitdiff | tree

Treehugger Robot [Mon, 2 Oct 2017 17:56:02 +0000 (17:56 +0000)]

Merge "Avoid NullPointerException when updating preference intents"

commit | commitdiff | tree

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

commit | commitdiff | tree

songkailun [Fri, 29 Sep 2017 09:37:17 +0000 (09:37 +0000)]

Merge "Fix wrong format in AndroidManifest.xml"
am: de795d12d1

Change-Id: I443534ac7e122e337102d41c4138a0e94be72f7f

commit | commitdiff | tree

Treehugger Robot [Fri, 29 Sep 2017 06:45:30 +0000 (06:45 +0000)]

Merge "Fix wrong format in AndroidManifest.xml"

commit | commitdiff | tree

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>

commit | commitdiff | tree

Lei Yang [Tue, 26 Sep 2017 23:35:26 +0000 (23:35 +0000)]

Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
am: d2f42970bf

Change-Id: Iecac3e7e8a04356f377a2d8886bb86f70c0ab96e

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

Colin Cross [Tue, 26 Sep 2017 01:18:50 +0000 (01:18 +0000)]

Merge "Remove unnecessary core-oj library"
am: a37bf5616a

Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db

commit | commitdiff | tree

Treehugger Robot [Tue, 26 Sep 2017 01:12:30 +0000 (01:12 +0000)]

Merge "Remove unnecessary core-oj library"

commit | commitdiff | tree

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

commit | commitdiff | tree

Doris Ling [Thu, 21 Sep 2017 19:24:52 +0000 (19:24 +0000)]

Merge "Fix NPE crash in UsageAccessDetails"
am: cd959f28a0

Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252

commit | commitdiff | tree

Doris Ling [Thu, 21 Sep 2017 19:21:03 +0000 (19:21 +0000)]

Merge "Fix NPE crash in UsageAccessDetails"

commit | commitdiff | tree

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>

commit | commitdiff | tree

Doris Ling [Fri, 15 Sep 2017 01:33:16 +0000 (01:33 +0000)]

Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd

commit | commitdiff | tree

Doris Ling [Thu, 14 Sep 2017 22:13:58 +0000 (22:13 +0000)]

Merge "Default apps settings disappear when switching to secondary user"

commit | commitdiff | tree

edgar.huang [Thu, 14 Sep 2017 20:37:15 +0000 (20:37 +0000)]

Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am: 62a021850f

Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3

commit | commitdiff | tree

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."

commit | commitdiff | tree

Erik Kline [Thu, 14 Sep 2017 08:14:09 +0000 (08:14 +0000)]

Merge changes Icd3d09aa,I4b070964
am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642

commit | commitdiff | tree

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.

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

debesay guadad [Mon, 11 Sep 2017 20:09:47 +0000 (20:09 +0000)]

Merge "Add ims registration status"
am: 9b7479f8a9 -s ours

Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]

Merge "Add ims registration status"

commit | commitdiff | tree

Brad Ebinger [Mon, 11 Sep 2017 19:42:37 +0000 (19:42 +0000)]

Merge "Add ims registration status" into stage-aosp-master

commit | commitdiff | tree

Amit Mahajan [Mon, 11 Sep 2017 17:37:55 +0000 (17:37 +0000)]

Merge "Change to disable mvno data field in ApnEditor if needed."
am: c2c0edff09

Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc

commit | commitdiff | tree

Treehugger Robot [Mon, 11 Sep 2017 17:21:07 +0000 (17:21 +0000)]

Merge "Change to disable mvno data field in ApnEditor if needed."

commit | commitdiff | tree

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

commit | commitdiff | tree

daqi [Fri, 8 Sep 2017 10:04:17 +0000 (10:04 +0000)]

Merge "Fix TrustedCredentialsSettings NPE"
am: c9e532f508

Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14

commit | commitdiff | tree

Treehugger Robot [Fri, 8 Sep 2017 09:56:31 +0000 (09:56 +0000)]

Merge "Fix TrustedCredentialsSettings NPE"

commit | commitdiff | tree

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

commit | commitdiff | tree

debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]

commit | commitdiff | tree

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>

commit | commitdiff | tree

edgar.huang [Wed, 6 Sep 2017 00:21:17 +0000 (00:21 +0000)]

Merge "Settings is crashed high probability when doing follow steps"
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46

commit | commitdiff | tree

Treehugger Robot [Wed, 6 Sep 2017 00:12:44 +0000 (00:12 +0000)]

Merge "Settings is crashed high probability when doing follow steps"

commit | commitdiff | tree

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.

commit | commitdiff | tree

Colin Cross [Thu, 31 Aug 2017 22:24:00 +0000 (22:24 +0000)]

Merge "Fix errorprone build"
am: 0bed3cacd7 -s ours

Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8

commit | commitdiff | tree

Treehugger Robot [Thu, 31 Aug 2017 22:16:52 +0000 (22:16 +0000)]

Merge "Fix errorprone build"

commit | commitdiff | tree

Maurice Lam [Thu, 31 Aug 2017 02:10:37 +0000 (02:10 +0000)]

Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b

commit | commitdiff | tree

Maurice Lam [Thu, 31 Aug 2017 02:04:01 +0000 (02:04 +0000)]

Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Amit Mahajan [Tue, 22 Aug 2017 23:47:07 +0000 (23:47 +0000)]

Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422
am: f70f53473a

Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db

commit | commitdiff | tree

TreeHugger Robot [Tue, 22 Aug 2017 23:31:10 +0000 (23:31 +0000)]

Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837
am: a81a339c1d -s ours

Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a

commit | commitdiff | tree

Amit Mahajan [Tue, 22 Aug 2017 21:19:52 +0000 (21:19 +0000)]

Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052
am: b2498bc422

Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac

commit | commitdiff | tree

Amit Mahajan [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]

Merge "Change to not cache user entered apn type as user may change it."
am: 54eeafa052

Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c

commit | commitdiff | tree

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."

commit | commitdiff | tree

TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]

Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
am: b87acf6837

Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf

commit | commitdiff | tree

TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]

Merge changes from topic "Read dun APNs from apn db"
am: f9390ce1fb

Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]

Check for null mReadOnlyApnTypes.

Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Fri, 18 Aug 2017 01:50:29 +0000 (01:50 +0000)]

Import translations. DO NOT MERGE am: 4ced4787ce -s ours
am: 5b9b88cc5b -s ours

Change-Id: I40b762159141b73056cc04ceb18e084d49e53723

commit | commitdiff | tree

Bill Yi [Fri, 18 Aug 2017 01:45:26 +0000 (01:45 +0000)]

Import translations. DO NOT MERGE
am: 4ced4787ce -s ours

Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:24:02 +0000 (21:24 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours am: b4678ce1d2 -s ours
am: 9a416573d7 -s ours

Change-Id: I2a81249795e44842ebe8ef3ff5f4aab62ff3e6cc

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:23:05 +0000 (21:23 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours am: 28f6dd01bc -s ours
am: 8fe20711fa -s ours

Change-Id: I3448fc6d16584807cefbcdca45be0efe022702c8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:22:17 +0000 (21:22 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours
am: bbe3047d1d -s ours

Change-Id: I7233624570a758b4e7e8dfc6410401cfbde11df8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:51:19 +0000 (20:51 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours am: b4678ce1d2 -s ours
am: d430178ba4 -s ours

Change-Id: If72ef8b01ef6a90c4752710b5568eeea2bb63796

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:50:39 +0000 (20:50 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours am: 28f6dd01bc -s ours
am: c62f6f30bc -s ours

Change-Id: Iabba05d1d43a40d35e0ce198879d91410440d7b1

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:48:07 +0000 (20:48 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours
am: 5575d285db -s ours

Change-Id: I6f5163890c6a333d9c1dba9ed2c63c364acb6cce

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:42:38 +0000 (20:42 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours
am: b4678ce1d2 -s ours

Change-Id: I199cfbc0ec36904483c35aa9712ab471cf5b4ec2

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:41:48 +0000 (20:41 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
am: 28f6dd01bc -s ours

Change-Id: If16f17e144156b08dc9fea587178cad18dc370e7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:40:59 +0000 (20:40 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
am: 0e22588ed0 -s ours

Change-Id: I7243a50b7d64e1ee63d85e4ce5467217c76d7bce

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:39:42 +0000 (20:39 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours
am: b4678ce1d2 -s ours

Change-Id: I350b04feb64b26fddbf366cd31d42d30ef0e02aa

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:38:24 +0000 (20:38 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
am: 28f6dd01bc -s ours

Change-Id: Ia95e462a6e007f0e87cfddb75b13f8ee7a89971a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:37:36 +0000 (20:37 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
am: 0e22588ed0 -s ours

Change-Id: I8025d40c5c1b3b6992d759a7f6a5355207236dff

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:25:12 +0000 (20:25 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours
am: 5d4a2bb844 -s ours

Change-Id: I949bed4c34aeea91e85eae01ffbf812e486ac5d8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:24:28 +0000 (20:24 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours
am: a6b4e032c8 -s ours

Change-Id: I141ba4edaa9fa21b95d7f8d353764db26d9a5b6a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:23:41 +0000 (20:23 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours
am: 142433924f -s ours

Change-Id: Id62e3af77aba546d3a83a8467dc60af88fbf6083

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:22:36 +0000 (20:22 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours
am: 23e185adf8 -s ours

Change-Id: I28fb4049f4c3a51d163cc77b60358736d082604e

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:18:15 +0000 (20:18 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours
am: df39274478 -s ours

Change-Id: I487f45dcd45eecbc587af45bdc748c842d6414d6

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:17:34 +0000 (20:17 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours
am: 82afc6c5fd -s ours

Change-Id: If3e96fdcd076bfe522b32726d05bef5f5a605d6a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:17:28 +0000 (20:17 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours
am: 3dd026d5dc -s ours

Change-Id: I55000b3f1b300a833bb643816413a83d65ebedec

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:14:42 +0000 (20:14 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours
am: 81ba0cc873 -s ours

Change-Id: I53467a6c6802c65bf458afa8fd800954bc91f99b

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:10:37 +0000 (20:10 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours
am: 202970aa92 -s ours

Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:09:35 +0000 (20:09 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours
am: 05fec2162a -s ours

Change-Id: I75623b15f15658930e459710fb46cc2f55d788e8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:08:56 +0000 (20:08 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours
am: 6d7bb4c4d0 -s ours

Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:06:04 +0000 (20:06 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:04:24 +0000 (20:04 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours
am: b2f5566de5 -s ours

Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:03:34 +0000 (20:03 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
am: 817c35056c -s ours

Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:02:33 +0000 (20:02 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:14 +0000 (19:55 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
am: 2e6cf5dcde -s ours

Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:02 +0000 (19:55 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 19:51:50 +0000 (19:51 +0000)]

Merge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours am: aedf7cdfdb -s ours am: f52c8ccbfc -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours am: aedf7cdfdb -s ours
am: baf4375f01 -s ours

Change-Id: I530a1f23f0a1804786fe3645a115176b53102a9b

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours am: aedf7cdfdb -s ours
am: f52c8ccbfc -s ours

Change-Id: I22a9fd9d0713277fa591b5a0ef7f6958931588b9

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours
am: 7bd8e120cb -s ours

Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:49:08 +0000 (19:49 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
am: aedf7cdfdb -s ours

Change-Id: I0a6af74c670ecfde23b1d5217f67ebccb14c0080

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
am: aedf7cdfdb -s ours

Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours
am: 29c1777ca5 -s ours

Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours
am: 0dba51f9f0 -s ours

Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help