OSDN Git Service
Christopher Tate [Thu, 21 May 2015 20:38:52 +0000 (20:38 +0000)]
am
7ca242e0: Merge "Close race condition in binderDied()" into mnc-dev
* commit '
7ca242e0b4f4abcf2f726ec3c45e3fed2a289c16':
Close race condition in binderDied()
Christopher Tate [Thu, 21 May 2015 20:27:11 +0000 (20:27 +0000)]
Merge "Close race condition in binderDied()" into mnc-dev
Leon Scroggins III [Thu, 21 May 2015 19:14:09 +0000 (19:14 +0000)]
am
aba3ecb9: Merge "Fix overflow in NinePatchImpl." into mnc-dev
* commit '
aba3ecb976cacd7c92fe8f8afae20d112781d68e':
Fix overflow in NinePatchImpl.
Deepanshu Gupta [Thu, 21 May 2015 19:14:04 +0000 (19:14 +0000)]
am
bbb0ae13: Merge "Add documentation about hack in commit:
f8ea750455" into mnc-dev
* commit '
bbb0ae13e2d1767dda1e0cf3e3546332d80379d2':
Add documentation about hack in commit:
f8ea750455
Leon Scroggins III [Thu, 21 May 2015 19:05:45 +0000 (19:05 +0000)]
Merge "Fix overflow in NinePatchImpl." into mnc-dev
Selim Cinek [Thu, 21 May 2015 19:00:08 +0000 (19:00 +0000)]
am
0cce531f: Fixed a bug where a notification could get below the empty shade view
* commit '
0cce531f2e4d67f9a4d8f55009a35bcc8498718e':
Fixed a bug where a notification could get below the empty shade view
Selim Cinek [Thu, 21 May 2015 19:00:04 +0000 (19:00 +0000)]
am
f98702ea: Protecting against the correct flag for the input consumer
* commit '
f98702eae04e239670e8b882d53c974d4b56e291':
Protecting against the correct flag for the input consumer
Deepanshu Gupta [Thu, 21 May 2015 18:59:30 +0000 (18:59 +0000)]
Merge "Add documentation about hack in commit:
f8ea750455" into mnc-dev
Craig Mautner [Thu, 21 May 2015 18:52:57 +0000 (18:52 +0000)]
am
714b0ab4: Merge "Add debug for bug
21055376." into mnc-dev
* commit '
714b0ab4cb52215dc38c12ce7ad7c0e9976ef5a7':
Add debug for bug
21055376.
Selim Cinek [Thu, 21 May 2015 05:13:55 +0000 (22:13 -0700)]
Fixed a bug where a notification could get below the empty shade view
This lead to a temporary flash when a notification came in with
the empty shade view being visible.
Bug:
20972545
Change-Id: I2b06f63dd43bf53bb2d1da0cddb635a709663f71
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit:
f8ea750455
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
Selim Cinek [Thu, 21 May 2015 05:48:40 +0000 (22:48 -0700)]
Protecting against the correct flag for the input consumer
Also allow hiding the navbar if immersive or immersivesticky.
Bug:
21089476
Change-Id: I540e668746056a0e4bb077898792afd225e4e19e
Craig Mautner [Thu, 21 May 2015 18:34:31 +0000 (18:34 +0000)]
Merge "Add debug for bug
21055376." into mnc-dev
Eino-Ville Talvala [Thu, 21 May 2015 18:18:59 +0000 (18:18 +0000)]
am
779d43a7: Merge "Camera2: Fix spelling mistake" into mnc-dev
* commit '
779d43a75b7047ea2d7b5040a955d04fe6006cff':
Camera2: Fix spelling mistake
Eino-Ville Talvala [Thu, 21 May 2015 18:15:29 +0000 (18:15 +0000)]
Merge "Camera2: Fix spelling mistake" into mnc-dev
Eino-Ville Talvala [Thu, 21 May 2015 18:14:10 +0000 (18:14 +0000)]
am
842568ec: Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
* commit '
842568ecebfb5bf6cabd7a7eabd8e8fa259dab72':
Camera2: Fix CaptureRequest @see links
Craig Mautner [Thu, 21 May 2015 18:12:51 +0000 (11:12 -0700)]
Add debug for bug
21055376.
Change-Id: I1e93fb225f2639af031cdfa748a7898f31ad5a94
Eino-Ville Talvala [Thu, 21 May 2015 18:10:51 +0000 (11:10 -0700)]
Camera2: Fix spelling mistake
Change-Id: I8c764d4c2ada34b126cb0097e8eefb710a08e310
Eino-Ville Talvala [Thu, 21 May 2015 18:09:37 +0000 (18:09 +0000)]
Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
Santos Cordon [Thu, 21 May 2015 17:44:09 +0000 (17:44 +0000)]
am
3dd9bbf8: Merge "Add intents for enabling phone accounts." into mnc-dev
* commit '
3dd9bbf8e752b8e0bd5e5c35c05da245c7cc76cc':
Add intents for enabling phone accounts.
Chad Brubaker [Thu, 21 May 2015 17:35:13 +0000 (17:35 +0000)]
am
431eac49: Merge "Cleanup Keystore API" into mnc-dev
* commit '
431eac49aab7924c41c226cc8293c6fa351b21c6':
Cleanup Keystore API
Clara Bayarri [Thu, 21 May 2015 17:35:08 +0000 (17:35 +0000)]
am
b5611f55: Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
* commit '
b5611f555dc7c05028561dd38920d760d03846a2':
Update the documentation for ActionMode.Callback2#onGetContentRect
Narayan Kamath [Thu, 21 May 2015 17:35:02 +0000 (17:35 +0000)]
am
6bd37924: Merge "Fix application moves." into mnc-dev
* commit '
6bd37924b6e1a0e4cbc1247680c20b3b4bc2295b':
Fix application moves.
Santos Cordon [Thu, 21 May 2015 17:32:36 +0000 (17:32 +0000)]
Merge "Add intents for enabling phone accounts." into mnc-dev
Chad Brubaker [Thu, 21 May 2015 17:26:43 +0000 (17:26 +0000)]
Merge "Cleanup Keystore API" into mnc-dev
Clara Bayarri [Thu, 21 May 2015 17:24:12 +0000 (17:24 +0000)]
Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
Narayan Kamath [Thu, 21 May 2015 17:23:15 +0000 (17:23 +0000)]
Merge "Fix application moves." into mnc-dev
Clara Bayarri [Thu, 21 May 2015 16:45:19 +0000 (17:45 +0100)]
Update the documentation for ActionMode.Callback2#onGetContentRect
Received feedback from a team that it was not clear what the rect
had to include.
Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1
Jean-Michel Trivi [Thu, 21 May 2015 16:28:38 +0000 (16:28 +0000)]
am
59845bef: Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev
* commit '
59845bef8e66c278c728744785852b8799d832fc':
Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags
Paul McLean [Thu, 21 May 2015 16:28:34 +0000 (16:28 +0000)]
am
d6c3404f: Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev
* commit '
d6c3404f597b4ea12c56554ab509e227f9722a77':
Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
Jean-Michel Trivi [Thu, 21 May 2015 16:24:00 +0000 (16:24 +0000)]
Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev
Jean-Michel Trivi [Thu, 21 May 2015 16:22:46 +0000 (16:22 +0000)]
am
e6b874b1: Merge "Fix reading attributes for playback restrictions" into mnc-dev
* commit '
e6b874b1aa4410235d9f839d35b57e3a1826410c':
Fix reading attributes for playback restrictions
Xiyuan Xia [Thu, 21 May 2015 16:22:41 +0000 (16:22 +0000)]
am
e695b59e: Merge "Do not show soft keyboard when locked out on keyguard UI" into mnc-dev
* commit '
e695b59eb586eeda064b715b5e35f4e491039e33':
Do not show soft keyboard when locked out on keyguard UI
Eric Laurent [Thu, 21 May 2015 16:22:36 +0000 (16:22 +0000)]
am
97de0c9a: Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
* commit '
97de0c9a29f76f936e1d93f9031e178b56af514f':
AudioService: indicate system ready to AudioFlinger
Paul McLean [Thu, 21 May 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev
Leon Scroggins III [Thu, 21 May 2015 13:48:15 +0000 (09:48 -0400)]
Fix overflow in NinePatchImpl.
Cast numXDivs to a size_t before adding 1, so that if numXDivs is 255
it does not overflow. Move the calculation outside of alloca().
BUG:
20727488
Change-Id: I2ecc9d650338acba7316554cb72195e02816b1f8
Paul McLean [Thu, 21 May 2015 15:51:18 +0000 (08:51 -0700)]
Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453
Jean-Michel Trivi [Thu, 21 May 2015 16:16:10 +0000 (16:16 +0000)]
Merge "Fix reading attributes for playback restrictions" into mnc-dev
Xiyuan Xia [Thu, 21 May 2015 16:15:50 +0000 (16:15 +0000)]
Merge "Do not show soft keyboard when locked out on keyguard UI" into mnc-dev
Eric Laurent [Thu, 21 May 2015 16:13:02 +0000 (16:13 +0000)]
Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:40:05 +0000 (13:40 +0000)]
am
d457c71e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d457c71eca2a0522793376a873dcdad318a2f798':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:28:23 +0000 (13:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:25:11 +0000 (13:25 +0000)]
am
8d0891d0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
8d0891d05d31c6aec2899473f0d8f76bd7e8c10c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 13:25:06 +0000 (13:25 +0000)]
am
c03190a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c03190a48ee2193b385ad066c768b3c2939c5ab8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 13:25:01 +0000 (13:25 +0000)]
am
7261a90c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
7261a90c1261ae3a98e58058acb7d0bb5fbc1cb0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 13:24:57 +0000 (13:24 +0000)]
am
376723e2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
376723e219ffa4dfbef98b4ec84c7f19cd3b4369':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 13:24:53 +0000 (13:24 +0000)]
am
39effd54: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
39effd54d7c5a4124a8b5588e3607e10c5b344c9':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:24:49 +0000 (13:24 +0000)]
am
3c7227ab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
3c7227abdcb282a5b7d96d6474d23427068bf0f6':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:22:40 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Narayan Kamath [Thu, 21 May 2015 09:50:35 +0000 (10:50 +0100)]
Fix application moves.
We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.
This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.
bug:
21337469
Change-Id: I3e9dfd5db1c928847f9d527dc15d29a05ff40e7d
Baligh Uddin [Thu, 21 May 2015 13:20:17 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:20 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:14 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:11 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:17:30 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I243054bfdbe5bae12a1b3eb9f26d7bb158681ae0
Auto-generated-cl: translation import
Geoff Mendal [Thu, 21 May 2015 13:16:22 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:13:24 +0000 (06:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68ce431c2c547d2192d007d8ac5af599dd5cf1ff
Auto-generated-cl: translation import
Geoff Mendal [Thu, 21 May 2015 13:10:03 +0000 (06:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc636bc980ceaead21d2eaf2dd813de284341ab0
Auto-generated-cl: translation import
Erik Kline [Thu, 21 May 2015 11:57:39 +0000 (11:57 +0000)]
am
cd7ed16f: LinkProperties function to compare provisioning and remove DNS servers
* commit '
cd7ed16f00d243568e3b73b7fc7f0f94cfebe8ce':
LinkProperties function to compare provisioning and remove DNS servers
Erik Kline [Thu, 21 May 2015 07:15:02 +0000 (16:15 +0900)]
LinkProperties function to compare provisioning and remove DNS servers
Adds:
- enum ProvisioningChange
- LinkProperties#compareProvisioning()
return a ProvisioningChange value describing the delta in
provisioning between two LinkProperties objects
- LinkProperties#removeDnsServer()
- make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()
Bug:
18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd
Jae Seo [Thu, 21 May 2015 05:36:47 +0000 (05:36 +0000)]
am
184016aa: Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev
* commit '
184016aac08c31eb9c3f8539fb362ed2dfb30a93':
TIF: Build the list of available TV inputs as the current user
Jae Seo [Thu, 21 May 2015 05:27:06 +0000 (05:27 +0000)]
Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev
Chet Haase [Thu, 21 May 2015 04:59:39 +0000 (04:59 +0000)]
am
4b901c45: Merge "Fix docs to not refer to non-public classes." into mnc-dev
* commit '
4b901c4506d495c0cbcad316e38797c6522e88d0':
Fix docs to not refer to non-public classes.
Baligh Uddin [Thu, 21 May 2015 04:59:08 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0f7cbb03d74e7c84ed90084d69a3d663f41214b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 21 May 2015 04:54:23 +0000 (21:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e800db526beb320e54c5f80ba8f8bf6a81391e0
Auto-generated-cl: translation import
Jae Seo [Thu, 21 May 2015 04:51:16 +0000 (21:51 -0700)]
TIF: Build the list of available TV inputs as the current user
Bug:
21313985
Change-Id: I8aa881570915d14d63e4ac0b8034044f8736443b
Baligh Uddin [Thu, 21 May 2015 04:51:28 +0000 (21:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92f614dd62de9ce0ad34cfaf7f24663dc9522eb4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 21 May 2015 04:49:20 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2ff568b531a2273366145275de4b2ab936703e4
Auto-generated-cl: translation import
Chet Haase [Thu, 21 May 2015 04:47:40 +0000 (04:47 +0000)]
Merge "Fix docs to not refer to non-public classes." into mnc-dev
Keisuke Kuroyanagi [Thu, 21 May 2015 04:18:50 +0000 (04:18 +0000)]
am
27a63612: Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
* commit '
27a63612343a3b4afb4deca6a992615855510963':
Fix: Crash when modifying text while using drag accelerator.
Keisuke Kuroyanagi [Thu, 21 May 2015 04:07:55 +0000 (04:07 +0000)]
Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:42:05 +0000 (03:42 +0000)]
am
dbf2cd16: Merge "Volume: Include a11y bit in dialog dump." into mnc-dev
* commit '
dbf2cd16606d6696cc961426a4e41412f43c8cc0':
Volume: Include a11y bit in dialog dump.
John Spurlock [Thu, 21 May 2015 03:35:11 +0000 (03:35 +0000)]
Merge "Volume: Include a11y bit in dialog dump." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:33:43 +0000 (23:33 -0400)]
Volume: Include a11y bit in dialog dump.
Bug:
21340132
Change-Id: Ie9a347e7e0f08c7019b4a483a3a87a8cba6f37da
Jean-Michel Trivi [Thu, 21 May 2015 02:14:45 +0000 (19:14 -0700)]
Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags
Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying
AudioAttributes flags that will be used when playing the
Ringtone.
Bug
19407114
Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
Deepanshu Gupta [Thu, 21 May 2015 01:59:52 +0000 (01:59 +0000)]
am
8562b08f: Merge "Fix overrides for BridgeResources." into mnc-dev
* commit '
8562b08f04c1309cf40db1e749d612b6824f1d12':
Fix overrides for BridgeResources.
Deepanshu Gupta [Thu, 21 May 2015 01:59:44 +0000 (01:59 +0000)]
am
84fd4af0: Merge "Make DatePicker rendering not fail." into mnc-dev
* commit '
84fd4af05353303750427b19ea20992694f864f8':
Make DatePicker rendering not fail.
Deepanshu Gupta [Thu, 21 May 2015 01:50:22 +0000 (01:50 +0000)]
Merge "Fix overrides for BridgeResources." into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 01:25:58 +0000 (18:25 -0700)]
Fix overrides for BridgeResources.
New method overloads have been introduces in android.content.Resources.
Change BridgeResources to overrides the appropriate ones. Also, fix the
implementation to the new behaviour.
Change-Id: I7b83b329f04286512f223c0fafc3f989f1b9a244
Deepanshu Gupta [Thu, 21 May 2015 01:47:13 +0000 (01:47 +0000)]
Merge "Make DatePicker rendering not fail." into mnc-dev
Christopher Tate [Thu, 21 May 2015 01:44:59 +0000 (01:44 +0000)]
am
62d1e1ef: Scan at boot time to detect newly-present full backup candidates
* commit '
62d1e1ef7e04f03c492b49e721ee9773677bba8b':
Scan at boot time to detect newly-present full backup candidates
Xiyuan Xia [Tue, 19 May 2015 22:00:41 +0000 (15:00 -0700)]
Do not show soft keyboard when locked out on keyguard UI
- Split password entry enabled and input enabled into two states;
- Disable input during lock check;
- Disable password entry when locked out;
- Don't show soft keyboard if password entry is disabled on resume;
- Auto show soft keyboard when password entry becomes enabled;
Bug:
20542149
Change-Id: Iffe3f205776143ac21e25e337d5b7a0e6994ebf2
Christopher Tate [Wed, 20 May 2015 21:49:38 +0000 (14:49 -0700)]
Scan at boot time to detect newly-present full backup candidates
OTA or similar might have caused an app to appear without the usual
notifications being sent. Make sure we pick up those apps as
appropriate for full-data backup.
Bug
19462310
Change-Id: Ic17bc72b14cc7599ae8ea540548fda932606b8f2
Adrian Roos [Thu, 21 May 2015 01:24:42 +0000 (01:24 +0000)]
am
770e9895: Merge "Fix ObservableScrollView\'s cancel dispatch" into mnc-dev
* commit '
770e98953e27573d24578008810eeb44c0755995':
Fix ObservableScrollView's cancel dispatch
Chet Haase [Thu, 21 May 2015 00:42:27 +0000 (17:42 -0700)]
Fix docs to not refer to non-public classes.
Issue #
21328285 public Midi docs refer to internal utility class
Change-Id: Idddd5c98a78159190c6c34b17350f4630c33d6d5
Jim Miller [Thu, 21 May 2015 01:13:11 +0000 (01:13 +0000)]
am
0a17fb4e: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
* commit '
0a17fb4e562d5375f795ee1301c4aba86443e023':
Move from native FingerprintService implementation to fingerprintd
Adrian Roos [Thu, 21 May 2015 01:12:58 +0000 (01:12 +0000)]
Merge "Fix ObservableScrollView's cancel dispatch" into mnc-dev
Adrian Roos [Thu, 21 May 2015 01:08:58 +0000 (18:08 -0700)]
Fix ObservableScrollView's cancel dispatch
Bug:
21239185
Change-Id: I8005556a2a6fcd8981e615a6f5537a1d7e9ce6a7
Deepanshu Gupta [Thu, 21 May 2015 01:01:48 +0000 (18:01 -0700)]
Make DatePicker rendering not fail.
Ensures that having a DatePicker in the layout doesn't crash the
complete rendering. The rendering is still not perfect, but at least it
works.
- Return a non-null window token so that ViewPager thinks that it's
attached to a window and doesn't skip populating the views.
- Fix a style not found issue.
Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
Jim Miller [Thu, 21 May 2015 00:57:26 +0000 (00:57 +0000)]
Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
Svetoslav [Thu, 21 May 2015 00:45:41 +0000 (00:45 +0000)]
am
eff64986: Merge "Do not call out of the settings provider with a lock held" into mnc-dev
* commit '
eff649862be8db389cf8480efa50ca1106dd2117':
Do not call out of the settings provider with a lock held
Eric Laurent [Wed, 20 May 2015 21:49:08 +0000 (14:49 -0700)]
AudioService: indicate system ready to AudioFlinger
Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.
Bug:
11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b
Svetoslav [Thu, 21 May 2015 00:35:12 +0000 (00:35 +0000)]
Merge "Do not call out of the settings provider with a lock held" into mnc-dev
Svetoslav [Thu, 21 May 2015 00:01:10 +0000 (17:01 -0700)]
Do not call out of the settings provider with a lock held
bug:
20443441
Change-Id: I704520b75f5deaeeb1b4098cda0783c667e8cdd1
Amith Yamasani [Thu, 21 May 2015 00:13:31 +0000 (00:13 +0000)]
am
4c02d38e: Merge "Use screen-on time and wallclock time for idleness calc" into mnc-dev
* commit '
4c02d38e97c341898e0b2310f9948a96a1a131d2':
Use screen-on time and wallclock time for idleness calc
Deepanshu Gupta [Thu, 21 May 2015 00:13:27 +0000 (00:13 +0000)]
am
c813375e: Merge "Use non deprecated method for creating ColorStateList" into mnc-dev
* commit '
c813375e533b9460f1b8ae870073788f7c9e8d36':
Use non deprecated method for creating ColorStateList
Craig Mautner [Thu, 21 May 2015 00:13:22 +0000 (00:13 +0000)]
am
116c9ed6: Merge "Avoid resuming activity before launch." into mnc-dev
* commit '
116c9ed60772f0e9f9170d358150c211cb802df5':
Avoid resuming activity before launch.
Deepanshu Gupta [Thu, 21 May 2015 00:13:17 +0000 (00:13 +0000)]
am
719c9b93: Fix line breaking.
* commit '
719c9b93f1f1b0a42addceb99484879b4ba10d50':
Fix line breaking.
Amith Yamasani [Thu, 21 May 2015 00:10:12 +0000 (00:10 +0000)]
Merge "Use screen-on time and wallclock time for idleness calc" into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 00:03:05 +0000 (00:03 +0000)]
Merge "Use non deprecated method for creating ColorStateList" into mnc-dev