OSDN Git Service
Jeff Sharkey [Wed, 8 Jul 2015 22:22:11 +0000 (22:22 +0000)]
am
68fdb73d: am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
68fdb73d0cb2e354063ff5e37349d942923e379e':
Move storage when formatting primary disk.
Jeff Sharkey [Wed, 8 Jul 2015 22:08:32 +0000 (22:08 +0000)]
am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
80eba76b109efa7e48eaf7aac145e05938d4405e':
Move storage when formatting primary disk.
Jeff Sharkey [Wed, 8 Jul 2015 21:55:17 +0000 (21:55 +0000)]
Merge "Move storage when formatting primary disk." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 20:53:35 +0000 (20:53 +0000)]
am
2856c4fc: am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
2856c4fcbd4d4453245f4ed0aa7bb1bc02b2bd14':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 20:53:32 +0000 (20:53 +0000)]
am
a63ee14f: am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 20:53:31 +0000 (20:53 +0000)]
am
f7a64d20: am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
f7a64d206869ef783820f08966ad3bbf8ebe4559':
Disable CA certificate for EAP-SIM, AKA & AKA'
Amit Mahajan [Wed, 8 Jul 2015 20:37:19 +0000 (20:37 +0000)]
am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 20:37:18 +0000 (20:37 +0000)]
am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 20:37:16 +0000 (20:37 +0000)]
am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'
Amit Mahajan [Wed, 8 Jul 2015 20:23:45 +0000 (20:23 +0000)]
Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 18:07:34 +0000 (11:07 -0700)]
Remove 'do not translate' comment for string 'None'.
Bug:
22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
Sanket Padawe [Wed, 8 Jul 2015 17:15:56 +0000 (17:15 +0000)]
Merge "Locale based string changes in BT." into mnc-dev
Sanket Padawe [Wed, 8 Jul 2015 17:14:54 +0000 (17:14 +0000)]
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
Robin Lee [Wed, 8 Jul 2015 16:40:44 +0000 (16:40 +0000)]
am
e46e4827: am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
Restore Vpn advanced options on re-init or rotate
Robin Lee [Wed, 8 Jul 2015 16:27:42 +0000 (16:27 +0000)]
am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
64e1e15d10b41f6993abf4cb77d220a05f79191a':
Restore Vpn advanced options on re-init or rotate
Robin Lee [Wed, 8 Jul 2015 16:17:22 +0000 (16:17 +0000)]
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 16:06:29 +0000 (16:06 +0000)]
am
661dbf01: (-s ours) am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
661dbf01b7ba8cfdb1ab9d1a5dd2054c640fa183':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 15:50:58 +0000 (15:50 +0000)]
am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 15:39:31 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 15:19:19 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
Jason Monk [Wed, 8 Jul 2015 13:57:40 +0000 (13:57 +0000)]
am
fa10637f: am
4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '
fa10637f2b42ba0d4cc81e6bb0f0a13eaf335e79':
Handle uninstall from notifications list
Jason Monk [Wed, 8 Jul 2015 13:44:38 +0000 (13:44 +0000)]
am
4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '
4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list
Jason Monk [Wed, 8 Jul 2015 13:34:40 +0000 (13:34 +0000)]
Merge "Handle uninstall from notifications list" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:12:30 +0000 (12:12 +0000)]
am
03b73068: am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
03b73068128807b4308185d04ab4688e71e02000':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:57:34 +0000 (11:57 +0000)]
am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:45:03 +0000 (11:45 +0000)]
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:25:44 +0000 (11:25 +0000)]
am
215af288: am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:10:45 +0000 (11:10 +0000)]
am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 05:14:15 +0000 (22:14 -0700)]
Move storage when formatting primary disk.
On devices where the primary storage is configured as a physical
device, and when we adopt that device, automatically move the
primary storage to be hosted on the newly created emulated volume.
Bug:
20275423
Change-Id: I759e65a01b323ef3c9ffb86d0b7c8e7b4768a45c
Wei Liu [Tue, 7 Jul 2015 22:37:11 +0000 (15:37 -0700)]
Move NetworkPolicyEditor from Settings packge to settingslib.
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
Christopher Tate [Wed, 8 Jul 2015 00:08:17 +0000 (00:08 +0000)]
am
fe71156d: am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
fe71156d076792eebd250dc22c5d2e9485f9cf58':
App link handling is not just for "official" verified handlers
Christopher Tate [Tue, 7 Jul 2015 23:49:11 +0000 (23:49 +0000)]
am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
8023385e56e472a55e9c6f5034e04a10f1088f57':
App link handling is not just for "official" verified handlers
Christopher Tate [Tue, 7 Jul 2015 23:35:52 +0000 (23:35 +0000)]
Merge "App link handling is not just for "official" verified handlers" into mnc-dev
Christopher Tate [Wed, 1 Jul 2015 23:52:43 +0000 (16:52 -0700)]
App link handling is not just for "official" verified handlers
Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.
Also clean up a bunch of inconsistent/wrong state reporting in the UI.
Bug
22069429
Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d
Amith Yamasani [Tue, 7 Jul 2015 20:54:18 +0000 (20:54 +0000)]
am
8e9aca37: am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
Use localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 20:37:31 +0000 (20:37 +0000)]
am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
7ac21204e16c797cc4f818ccc51509d425ffaf80':
Use localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 20:20:03 +0000 (20:20 +0000)]
Merge "Use localized name for guest user" into mnc-dev
Zoltan Szatmary-Ban [Wed, 1 Jul 2015 15:45:34 +0000 (16:45 +0100)]
Making Settings > Storage multiprofile aware
Also fixing the order of preferences there.
Bug:
22223456
Bug:
22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
Sanket Padawe [Tue, 7 Jul 2015 19:13:08 +0000 (12:13 -0700)]
Locale based string changes in BT.
Bug:
22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
Jason Monk [Tue, 7 Jul 2015 18:57:47 +0000 (14:57 -0400)]
Handle uninstall from notifications list
Don't crash in InstalledAppDetails on invalid app and finish app
notification details when the app goes away.
Bug:
22311566
Change-Id: I0bb7302dc16dd1a6f3aca152037705ad657d5554
Amith Yamasani [Tue, 7 Jul 2015 17:13:12 +0000 (10:13 -0700)]
Use localized name for guest user
Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.
Bug:
22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
Zoltan Szatmary-Ban [Tue, 7 Jul 2015 12:24:07 +0000 (13:24 +0100)]
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Bug:
22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
Sanket Padawe [Mon, 6 Jul 2015 23:14:43 +0000 (16:14 -0700)]
Disable CA certificate for EAP-SIM, AKA & AKA'
Bug:
21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
Jorim Jaggi [Mon, 6 Jul 2015 21:20:03 +0000 (21:20 +0000)]
am
30001127: am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
30001127b22ef39e02155919adaa3906829c9688':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 21:04:31 +0000 (21:04 +0000)]
am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 20:48:39 +0000 (20:48 +0000)]
Merge "Text changes to assist & voice input" into mnc-dev
Jorim Jaggi [Mon, 6 Jul 2015 18:48:27 +0000 (11:48 -0700)]
Text changes to assist & voice input
Bug:
22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
Jeff Sharkey [Mon, 6 Jul 2015 18:45:37 +0000 (18:45 +0000)]
am
355c13d2: am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
355c13d294a6c572637571d7df6369916e92394d':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 18:45:35 +0000 (18:45 +0000)]
am
bdb64bf1: am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
bdb64bf194c882242af6d2c30cdb421a06cce69a':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Robin Lee [Thu, 2 Jul 2015 02:10:22 +0000 (19:10 -0700)]
Restore Vpn advanced options on re-init or rotate
Visibility isn't restored as part of instance state by default.
Bug:
22183281
Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
Jeff Sharkey [Mon, 6 Jul 2015 18:12:56 +0000 (18:12 +0000)]
am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:55 +0000 (18:12 +0000)]
am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
7616b00bb5968382c5f49394fc842049f7ce9185':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 18:00:32 +0000 (18:00 +0000)]
Merge "Fix init order so we have something to measure." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:51 +0000 (17:57 +0000)]
Merge changes from topic 'mig' into mnc-dev
* changes:
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 17:17:42 +0000 (10:17 -0700)]
Fix init order so we have something to measure.
Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.
Bug:
22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea
Geoff Mendal [Mon, 6 Jul 2015 15:17:10 +0000 (15:17 +0000)]
am
c869c959: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
c869c9597546c9e8f39bc71e0f98b10b341d9e73':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:02:23 +0000 (15:02 +0000)]
am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
e21573da9205343e5b531f468b534a1bf02098fe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:49:17 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ca583a0b6b57e1c1cc27e5aaae009e85f906b86
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 6 Jul 2015 05:09:07 +0000 (22:09 -0700)]
Fix some ordering, colors, and accessibility bugs.
When adding preferences to public/private details screens, always
add in-order when rebuilding. Hacky fix for broken summary text and
eject image color tints.
Fix crash when device rotated during partitioning. Set correct
accessibility titles in all wizard steps.
Bug:
22098044,
21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
Jeff Sharkey [Sun, 5 Jul 2015 21:17:40 +0000 (14:17 -0700)]
Handle missing migration source volume.
Users can try migrating primary storage while the current location
is missing/unmounted. Fail gracefully instead of runtime restarting.
Bug:
21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156
Svetoslav [Thu, 2 Jul 2015 01:33:32 +0000 (18:33 -0700)]
Fix build
Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378
Marco Nelissen [Wed, 1 Jul 2015 19:13:43 +0000 (19:13 +0000)]
Merge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Tue, 30 Jun 2015 21:52:04 +0000 (14:52 -0700)]
Fix USB mode development setting
USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.
Bug:
22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e
Geoff Mendal [Wed, 1 Jul 2015 15:42:32 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 14:52:03 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibe88fd3db790a357712803481a4a3dc2befe22cc
Auto-generated-cl: translation import
Jason Monk [Wed, 1 Jul 2015 14:36:30 +0000 (10:36 -0400)]
Avoid crashing
Bug:
22202631
Change-Id: I1980f77ae4300dbd19d6829dc5974bab0b88d612
Avish Shah [Fri, 19 Jun 2015 11:20:39 +0000 (16:50 +0530)]
Device Discoverability not set properly when Bluetooth is toggled
Issue:
When BT is turned off/on staying in the same BT Settings
screen discoverability was not set again.
Fix:
Handle setting discoverability Bluetooth state change
intents also when BT state is turned ON.
Bug:
21944289
Change-Id: Ic3c8d476c53673b21d40ea2bd9669758d89c2aee
Adam Lesinski [Sat, 27 Jun 2015 01:05:37 +0000 (18:05 -0700)]
Update FakeUid to implement new method defined in BatteryStats.Uid
Bug:
21498425
Change-Id: I956c04d13daf985d472cc7ff2762ad74d5bb9502
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Merge dex2oat with app being installed" into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 23:00:27 +0000 (23:00 +0000)]
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 21:23:54 +0000 (14:23 -0700)]
Only allow admin users to adopt sd card as internal storage.
Bug:
21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 16:18:26 +0000 (12:18 -0400)]
Handle adjust volume user restriction
- Finish all do not disturb pages immediately
- Disable relevant items in Sounds & notification
Bug:
21642285
Change-Id: I8de9bd10b8cea8adaa306b1ae388ab7d1ccc4e7e
Makoto Onuki [Tue, 30 Jun 2015 16:40:56 +0000 (16:40 +0000)]
Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:20:57 +0000 (14:20 +0000)]
Merge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:15:53 +0000 (10:15 -0400)]
Fix crash in ignore optimizations dialog
Launch it like a dialog, because it is one.
Bug:
22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa
Rubin Xu [Tue, 30 Jun 2015 14:05:31 +0000 (14:05 +0000)]
Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:03:04 +0000 (14:03 +0000)]
Merge "Reduce jank in wifi settings" into mnc-dev
Adam Lesinski [Fri, 26 Jun 2015 23:31:44 +0000 (16:31 -0700)]
Merge dex2oat with app being installed
Bug:
22008744
Change-Id: Id87fe215760202e2969c27d686fa8ba106b00754
Jorim Jaggi [Fri, 26 Jun 2015 23:40:41 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (2/2)
Bug:
22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
Jorim Jaggi [Sat, 27 Jun 2015 01:49:35 +0000 (18:49 -0700)]
Fix userId for credentials from managed profiles
Bug:
22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c
Jason Monk [Mon, 29 Jun 2015 19:52:51 +0000 (19:52 +0000)]
Merge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 18:52:54 +0000 (14:52 -0400)]
Remove char limit from owner info
Bug:
21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1
Jason Monk [Mon, 29 Jun 2015 18:55:18 +0000 (18:55 +0000)]
Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 18:42:25 +0000 (14:42 -0400)]
Handle rotation (or refresh) before callback is received
Make sure we unregister the old receiver
Bug:
22160603
Change-Id: I798ca07dd65711caa4d3295b7ad811ca2fc69c1d
Jason Monk [Mon, 29 Jun 2015 17:28:21 +0000 (13:28 -0400)]
Reduce jank in wifi settings
- Fix view recycling for AccessPointPreferences by adding a dummy
during initial inflation
- Cut down on what is done during onBindView and refresh()
- Try to re-use AccessPointPreferences when possible
Some jank still occurs when scan results come in, but it is less
than before.
Bug:
16518752
Change-Id: I2619303281dd50aa3864783c49738ae9f221834a
Geoff Mendal [Mon, 29 Jun 2015 14:50:47 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4c36b177018329faa9359c2d02f3ebc33bb1134
Auto-generated-cl: translation import
Sanket Padawe [Sun, 28 Jun 2015 02:45:39 +0000 (02:45 +0000)]
Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev
Yohei Yukawa [Sat, 27 Jun 2015 21:40:51 +0000 (21:40 +0000)]
Merge "Dont crash if there is no spellchecker" into mnc-dev
Johan Redestig [Sat, 7 Mar 2015 06:48:41 +0000 (07:48 +0100)]
Dont crash if there is no spellchecker
The fact that isSpellCheckerEnabled returns true does not mean
that getCurrentSpellChecker will return non null. By default
isSpellCheckerEnabled is true in TextServicesSettings, even when
there is no spellchecker service active on the device.
The issue can be verified by disabling the Google Keyboard (assuming
the GMS LatinImeGoogle is used) in Settings|Apps and later
entering Settings|Language & input. Without this patch Settings
crashes at that point with the following stack:
E/AndroidRuntime(13020): Caused by: java.lang.NullPointerException: \
Attempt to invoke virtual method 'java.lang.CharSequence android.vie\
w.textservice.SpellCheckerInfo.loadLabel(android.content.pm.PackageM\
anager)' on a null object reference
E/AndroidRuntime(13020): at com.android.settings.inputmethod.\
InputMethodAndLanguageSettings.onResume(InputMethodAndLanguageSettin\
gs.java:253)
E/AndroidRuntime(13020): at android.app.Fragment.performResum\
e(Fragment.java:2096)
E/AndroidRuntime(13020): at android.app.FragmentManagerImpl.m\
oveToState(FragmentManager.java:928)
E/AndroidRuntime(13020): at android.app.FragmentManagerImpl.m\
oveToState(FragmentManager.java:1067)
Bug:
19832033
Change-Id: I65e6d269572e064aa6897807b6611ef947d90211
Adam Lesinski [Sat, 27 Jun 2015 01:10:47 +0000 (01:10 +0000)]
Merge "Report real wifi running time in Power Details" into mnc-dev
Adam Lesinski [Sat, 27 Jun 2015 01:04:47 +0000 (18:04 -0700)]
Report real wifi running time in Power Details
Bug:
21934412
Change-Id: Ic8623c8b424021f1af3d143d3b07398dd22091d6
Sanket Padawe [Fri, 26 Jun 2015 22:57:43 +0000 (15:57 -0700)]
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
Bug:
22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
Shirish Kalele [Fri, 26 Jun 2015 21:34:22 +0000 (21:34 +0000)]
Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
Jim Miller [Fri, 26 Jun 2015 00:18:12 +0000 (17:18 -0700)]
Remove userActivity() from Settings now that it's managed by FingerprintService
Fixes bug
20732273
Change-Id: Ia6ad603cab0255d3ee8739c36516597594acd1f2
Rubin Xu [Fri, 26 Jun 2015 14:27:23 +0000 (15:27 +0100)]
No longer use ExternalStorageFormatter to format external storage
Bug:
9433509
Change-Id: I5723828de080df568937004157acf830ca190f81
Makoto Onuki [Thu, 25 Jun 2015 23:39:01 +0000 (16:39 -0700)]
Make sure Fragments are public for FragMan to instantiate
Bug
21990428
Change-Id: If2dd5e43a4cc73ccf60278fdab874516c7fc181b
Robin Lee [Thu, 25 Jun 2015 23:01:44 +0000 (16:01 -0700)]
Fix build
Change-Id: Ibb2db14b2fd38b2c8c066c97f8cd6e396c104ce8
Robin Lee [Thu, 25 Jun 2015 22:27:54 +0000 (22:27 +0000)]
Merge "Enable VPN settings for secondary users" into mnc-dev