OSDN Git Service
Baligh Uddin [Sat, 19 Sep 2015 02:41:30 +0000 (02:41 +0000)]
am
ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
ce992f1b580b6cf55fc6f5992e5037ba616cd1f3':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:35:12 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Justin Harrison [Sat, 19 Sep 2015 00:29:40 +0000 (00:29 +0000)]
am
91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '
91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
Add support for setting color transforms
Tim Kilbourn [Sat, 19 Sep 2015 00:29:35 +0000 (00:29 +0000)]
am
0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev
* commit '
0eb10ede2364bf975721d95f7af7a1e4f4b617f8':
Always set the usb config when modifying it.
Justin Harrison [Sat, 19 Sep 2015 00:21:41 +0000 (00:21 +0000)]
Merge "Add support for setting color transforms" into mnc-dr-dev
Tim Kilbourn [Fri, 18 Sep 2015 23:55:56 +0000 (23:55 +0000)]
Merge "Always set the usb config when modifying it." into mnc-dr-dev
Michael Wright [Mon, 14 Sep 2015 23:13:26 +0000 (00:13 +0100)]
Add support for setting color transforms
Bug:
24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
Vineeta Srivastava [Fri, 18 Sep 2015 22:21:36 +0000 (22:21 +0000)]
am
22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
* commit '
22fe39b49c1d7cb22d8dfbb4f8e98af28be48a24':
set config_use_sim_language_file false for SE Telia/Sweden 3G
Adam Lesinski [Fri, 18 Sep 2015 22:21:31 +0000 (22:21 +0000)]
am
e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit '
e54253bdd317cbe806225081ad9ebe64f2b50b9a':
Fix crash when no power_profile is specified
Vineeta Srivastava [Fri, 18 Sep 2015 22:19:41 +0000 (22:19 +0000)]
Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
Adam Lesinski [Fri, 18 Sep 2015 22:15:19 +0000 (22:15 +0000)]
Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
sangjoon84.lee [Fri, 18 Sep 2015 08:50:55 +0000 (17:50 +0900)]
set config_use_sim_language_file false for SE Telia/Sweden 3G
BUG=
24184934
Change-Id: I721b3e6c29b78a792a15ab4ba72a81a3f4ce270d
Tim Kilbourn [Fri, 18 Sep 2015 21:57:28 +0000 (14:57 -0700)]
Always set the usb config when modifying it.
On some devices, setting system properties takes too long and we end up
with races where adbd gets killed and never comes back. With this
change we avoid a small optimization that checks the previous value of
the config, instead opting to set it every time.
Bug:
23631400
Change-Id: I7567cc2efb3d5d15c45334bd66b28877a2af0ac3
Adam Lesinski [Fri, 18 Sep 2015 21:56:34 +0000 (14:56 -0700)]
Fix crash when no power_profile is specified
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.
Bug:
23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
Christine Hallstrom [Fri, 18 Sep 2015 21:29:09 +0000 (21:29 +0000)]
Merge "Manual 'cherry pick' to fix CTS tests for MediaControllerTest." into cw-e-dev
Christine Hallstrom [Fri, 18 Sep 2015 21:04:22 +0000 (14:04 -0700)]
Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.
The original reverted change can be found at ag/723643.
Bug:
24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc
Adam Lesinski [Fri, 18 Sep 2015 20:38:02 +0000 (20:38 +0000)]
am
68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '
680553957e4ff47343334881c34de6969b2ed977':
BatteryStats: Better big-little CPU accounting
Adam Lesinski [Fri, 18 Sep 2015 20:26:07 +0000 (20:26 +0000)]
Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
Baligh Uddin [Fri, 18 Sep 2015 17:22:02 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61591ecfb78bae60091771b015e0898570f55abe
Auto-generated-cl: translation import
Adam Powell [Fri, 18 Sep 2015 16:33:57 +0000 (16:33 +0000)]
am
1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '
1b67a6b84d133e1fdac352d0821034ceca739a71':
Badge ChooserActivity choices with their app icon for disambig
Adam Powell [Fri, 18 Sep 2015 16:25:30 +0000 (16:25 +0000)]
Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
Shishir Agrawal [Fri, 18 Sep 2015 02:02:11 +0000 (02:02 +0000)]
am
896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev
* commit '
896f738cdddec8cfda82b177e3a60c5a85004229':
Allow non-persistent manual network selection.
Shishir Agrawal [Fri, 18 Sep 2015 01:49:58 +0000 (01:49 +0000)]
Merge "Allow non-persistent manual network selection." into mnc-dr-dev
Jorim Jaggi [Fri, 18 Sep 2015 00:48:47 +0000 (00:48 +0000)]
am
58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
* commit '
58e378b02561d8f606066537b193b0eb62e2404f':
Start fingerprint authentication in onStartedGoingToSleep
Jorim Jaggi [Fri, 18 Sep 2015 00:48:41 +0000 (00:48 +0000)]
am
5c0c5ac8: Handle case correctly when screen times out and locking immediately
* commit '
5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84':
Handle case correctly when screen times out and locking immediately
Jorim Jaggi [Fri, 18 Sep 2015 00:41:31 +0000 (00:41 +0000)]
Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
Jorim Jaggi [Wed, 16 Sep 2015 22:53:42 +0000 (15:53 -0700)]
Start fingerprint authentication in onStartedGoingToSleep
We used to start fingerprint authentication in onFinishedGoingToSleep.
This was a UX issue because then users couldn't place the finger on
the sensor immediately after pressing the power button because
onFinishedGoingToSleep is significantly delayed (around 900ms after
pressing the power button).
Bug:
23570959
Change-Id: I0bf557ebd10e6a8b033ab98a78aa338bf6538dcc
Jorim Jaggi [Wed, 16 Sep 2015 21:53:48 +0000 (14:53 -0700)]
Handle case correctly when screen times out and locking immediately
In case the the screen timed out and the setting was set to "lock now"
in case the screen times out, we locked before finished going to sleep,
leading to all kinds of state messups in Keyguard, including an empty
lockscreen when authenticating with fingerprint during that period.
Bug:
23952388
Change-Id: If1629be1171c841d51ec0555422e6108002fdb73
Zach Riggle [Thu, 17 Sep 2015 22:42:18 +0000 (22:42 +0000)]
am
2ebcf2c2: am
ad0acf1d: am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
2ebcf2c28fd1657a98a7dc4a90bcbe7e78f296e9':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:33:34 +0000 (22:33 +0000)]
am
ad0acf1d: am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
ad0acf1d104988238f431d874f0ecf9917a06699':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:25:53 +0000 (22:25 +0000)]
am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
9836b64f529238d1219f1937abf481383cd0cacd':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:17:11 +0000 (22:17 +0000)]
am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
f68b1953259a13562f5a2331526edafae5c1d99f':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:00:29 +0000 (22:00 +0000)]
am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
683cd049f7c762251567a0e0386ee49bb1428351':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for
521def98 to lmp-mr1-dev
Adam Powell [Thu, 17 Sep 2015 20:38:16 +0000 (13:38 -0700)]
Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.
Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.
In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.
Bug
24113937
Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
Bryce Lee [Thu, 17 Sep 2015 03:06:46 +0000 (20:06 -0700)]
Fix build due to merge of duplicate variable.
Change-Id: I1e8bad32b2118542408b6d8b87302861e3873d32
Tim Murray [Thu, 17 Sep 2015 02:33:35 +0000 (02:33 +0000)]
am
952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
* commit '
952d5b334ccdf9cab0f56673861906e59d4e9933':
Send power hint on fling gestures.
Tim Murray [Thu, 17 Sep 2015 02:24:32 +0000 (02:24 +0000)]
Merge "Send power hint on fling gestures." into mnc-dr-dev
Michael Wright [Wed, 16 Sep 2015 22:19:26 +0000 (23:19 +0100)]
Send power hint on fling gestures.
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.
bug
24059298
Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
Jorim Jaggi [Wed, 16 Sep 2015 23:56:25 +0000 (23:56 +0000)]
am
18f18ae0: Allow camera launch also when device is interactive
* commit '
18f18ae078ee97bbdfc9da39d4a19866dceb6a3e':
Allow camera launch also when device is interactive
Jorim Jaggi [Thu, 10 Sep 2015 22:48:21 +0000 (15:48 -0700)]
Allow camera launch also when device is interactive
Bug:
23967648
Change-Id: If91df75e6325b3969dc2351a70af0c160d3eab04
Yuchao Zhou [Wed, 16 Sep 2015 22:53:10 +0000 (22:53 +0000)]
am
c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev
* commit '
c38ffecc348687ae30c5fa2dc1761d9138b406b6':
Moving BTtraffic from experiment location to here
Yuchao Zhou [Wed, 16 Sep 2015 22:42:34 +0000 (22:42 +0000)]
Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev
Yuchao Zhou [Wed, 16 Sep 2015 17:58:37 +0000 (10:58 -0700)]
Moving BTtraffic from experiment location to here
Change-Id: I1b0ec7fba87a098aa6509bd9be3f0e0ff624bf6e
Adam Powell [Wed, 16 Sep 2015 21:02:58 +0000 (21:02 +0000)]
am
39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
* commit '
39e94ebe22d4959facea4c3621a0a5377242a570':
Handle single-choice ChooserActivities and bound ChooserTargetServices
Fyodor Kupolov [Wed, 16 Sep 2015 21:02:53 +0000 (21:02 +0000)]
am
bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit '
bfc584df683a84dffd8e04b7b13f619606a0a42a':
Use app directory as apkPath for cluster installs
Jack Yu [Wed, 16 Sep 2015 21:02:48 +0000 (21:02 +0000)]
am
870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
* commit '
870a9e6a783c7755b059d8533ae0232873bff9ba':
Added a carrier config key for emergency messages on/off option always showing.
Adam Powell [Wed, 9 Sep 2015 00:01:49 +0000 (17:01 -0700)]
Handle single-choice ChooserActivities and bound ChooserTargetServices
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.
Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.
Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.
Bug
23152483
Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit
9761ab2a645a4643bd20619c7c148ef07e0dd39d)
Fyodor Kupolov [Wed, 16 Sep 2015 19:37:47 +0000 (19:37 +0000)]
Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
Jack Yu [Wed, 16 Sep 2015 19:15:49 +0000 (19:15 +0000)]
Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
Chris Tate [Wed, 16 Sep 2015 17:11:19 +0000 (17:11 +0000)]
am
3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit '
3290f5dd067557727f166ff7a51ad2b5209622f6':
Do not back up/restore the "pulse LED for notifications" setting
Chris Tate [Wed, 16 Sep 2015 17:05:07 +0000 (17:05 +0000)]
Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
Andres Morales [Wed, 16 Sep 2015 16:12:03 +0000 (16:12 +0000)]
am
38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '
38e6e4ef98ea1f116902725c282df9fb061a224e':
reset lockout deadline on device reboot
Andres Morales [Wed, 16 Sep 2015 16:04:56 +0000 (16:04 +0000)]
Merge "reset lockout deadline on device reboot" into mnc-dr-dev
Zach Jang [Wed, 16 Sep 2015 02:25:32 +0000 (02:25 +0000)]
am
2b564bf4: am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
2b564bf42a68370dc4d32acbb597cfb7c45f9f4f':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:25:28 +0000 (02:25 +0000)]
am
0098cbc0: am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
0098cbc011771d5ffdf93a3a4b7e6a0507e1725d':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:16:04 +0000 (02:16 +0000)]
am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
716c6269674474867dc4720f86f739c639c83400':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:16:00 +0000 (02:16 +0000)]
am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
971ff47c75889a2fc4ac710fbe62ba819feeaba6':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)]
am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
63348ae4572cd9394e79fe343d2fca2b38498d1c':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:06:26 +0000 (02:06 +0000)]
am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
1b06455e44395489dcd027a170e68eabf2ebe1da':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)]
am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
11317e82cf561597bbd4e2dbf5840854e6b7a16d':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)]
am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
00db0826561b23a54db28ed5203fd7eff79c16c7':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
32a420ea36fbae07484f6fcf718ed97865ca3158':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
203b43547da94c9fb78931680b99f9db49fc46c9':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit
3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.
Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
Lorenzo Colitti [Wed, 16 Sep 2015 01:01:05 +0000 (01:01 +0000)]
am
7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
* commit '
7198c0aa4ccbeaecf2606006d3a6ace684f805fe':
Framework fixes for RSSI offload.
Lorenzo Colitti [Wed, 16 Sep 2015 00:54:57 +0000 (00:54 +0000)]
Merge "Framework fixes for RSSI offload." into mnc-dr-dev
Christopher Tate [Tue, 15 Sep 2015 21:26:12 +0000 (14:26 -0700)]
Do not back up/restore the "pulse LED for notifications" setting
Bug
24103790
Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
Jim Miller [Tue, 15 Sep 2015 21:22:50 +0000 (21:22 +0000)]
am
dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit '
dca3b2f74f7979e87e2654baf83df42483ef4388':
Add logging to track fingerprint reco but not unlocking
Guang Zhu [Tue, 15 Sep 2015 21:22:46 +0000 (21:22 +0000)]
am
fe74fb95: extend svc command to control NFC state
* commit '
fe74fb95b91a5d58a8d2d238c525e2f1891ca0c7':
extend svc command to control NFC state
Svet Ganov [Tue, 15 Sep 2015 21:22:41 +0000 (21:22 +0000)]
am
276da47a: am
cd946024: Default grant SMS and Phone to the verifier
* commit '
276da47adf23b5512985268f36fab0b7d2d11363':
Default grant SMS and Phone to the verifier
Jim Miller [Tue, 15 Sep 2015 21:08:06 +0000 (21:08 +0000)]
Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
Guang Zhu [Mon, 14 Sep 2015 01:43:56 +0000 (18:43 -0700)]
extend svc command to control NFC state
Change-Id: I599e4000fa17384089410e63b3150f25aa9458f7
Filip Gruszczynski [Tue, 15 Sep 2015 20:17:44 +0000 (13:17 -0700)]
Update circular mask after display is ready.
This fixes the situation where the circular mask is not applied because
the configuration is not reporting round screen. Configuration is
computed based on the display, so we can only depend on it having the
correct information after the display became ready.
Bug:
23689649
Bug:
23325855
Change-Id: I1e1fa307836f4053cfc4978da0239cb42c5af2c3
Svet Ganov [Tue, 15 Sep 2015 20:10:30 +0000 (20:10 +0000)]
am
cd946024: Default grant SMS and Phone to the verifier
* commit '
cd946024e94a8fe2f4009dbd2e5463817a17b3a9':
Default grant SMS and Phone to the verifier
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
This reverts commit
82b70db7dd906013d131737a5bec2ae59b41ae61.
Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
Lorenzo Colitti [Tue, 15 Sep 2015 06:56:01 +0000 (15:56 +0900)]
Framework fixes for RSSI offload.
1. When registering a NetworkCallback, only update RSSI
thresholds if the request specifies a signal strength.
2. When releasing a NetworkCallback, only update RSSI
thresholds if the request specified a signal strength.
3. Add logging.
Add logging.
Bug:
21405941
Bug:
23679346
Bug:
23815756
Change-Id: I4bc42d0ab02285a7a9d14e09f8a1cd868f4d9d7f
Lorenzo Colitti [Tue, 15 Sep 2015 02:46:36 +0000 (02:46 +0000)]
am
e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit '
e1e97377d04ab6e5d069c85aba4226f47371e7c6':
NetworkDiagnostics: ping default router from all global addreses.
Lorenzo Colitti [Tue, 15 Sep 2015 02:39:20 +0000 (02:39 +0000)]
Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
Jim Miller [Tue, 15 Sep 2015 01:58:08 +0000 (18:58 -0700)]
Add logging to track fingerprint reco but not unlocking
Bug
23940153
Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
Jack Yu [Mon, 14 Sep 2015 23:18:59 +0000 (16:18 -0700)]
Added a carrier config key for emergency messages on/off option always showing.
Adding a carrier config key that allows carriers to show "Turn on Notifications"
checkbox in Settings->More->Emergency broadcasts setting menu. If this key
exists and is set to true, this checkbox will always show up regardless of
developer options turned on or not.
bug:
23886750
Change-Id: I54dec5830653a0e27d7ee652effe572231f1e3bb
Vinod Krishnan [Mon, 14 Sep 2015 22:23:25 +0000 (22:23 +0000)]
Merge "Add some constants for Wear MNC Perms" into cw-e-dev
Sridhar Vashist [Mon, 14 Sep 2015 22:05:14 +0000 (22:05 +0000)]
am
efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit '
efc03355860359bb3edbb9573ba310f02742f416':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
Filip Gruszczynski [Mon, 14 Sep 2015 22:05:09 +0000 (22:05 +0000)]
am
0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied.
* commit '
0b388d4a368e8503411450504c6e3d39952bce16':
Don't animate burn-in return when it wasn't applied.
Vinod Krishnan [Tue, 1 Sep 2015 02:30:20 +0000 (19:30 -0700)]
Add some constants for Wear MNC Perms
- Add an API for getting list of apps that has runtime perms
Change-Id: I4ebfc01033ea96efaac062fd34982fbd0d081073
Adrian Roos [Mon, 14 Sep 2015 18:54:28 +0000 (18:54 +0000)]
am
6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev
* commit '
6b04e3a6ea042be0e012f7501fadb461b3d772a7':
Fix light status bar transitions
Adrian Roos [Mon, 14 Sep 2015 18:47:59 +0000 (18:47 +0000)]
Merge "Fix light status bar transitions" into mnc-dr-dev
Alexander Hills [Mon, 14 Sep 2015 18:34:32 +0000 (18:34 +0000)]
Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev
Chris Manton [Mon, 14 Sep 2015 17:29:09 +0000 (17:29 +0000)]
am
c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit '
c9180528452d67359618eda4aa2edd39112c83ca':
Add capability to ignore carrier entitlement checks
Chris Manton [Mon, 14 Sep 2015 17:23:42 +0000 (17:23 +0000)]
Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
Alan Viverette [Tue, 11 Aug 2015 21:27:04 +0000 (17:27 -0400)]
Cherry-pick system theme rebase to fix square UI on round watches
Our system themes were based on configurations that were added post-
init of the system theme.
I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes
If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.
This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.
Bug:
23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
Svet Ganov [Sat, 12 Sep 2015 17:19:54 +0000 (10:19 -0700)]
Default grant SMS and Phone to the verifier
bug:
24012164
Change-Id: I756644c8044076b2550d7ca104f542f50da0226b
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am
4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
* commit '
4c330c6ae53df48f6486b6f047021b204fc66594':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Jorim Jaggi [Sat, 12 Sep 2015 01:34:26 +0000 (01:34 +0000)]
am
84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager
* commit '
84dc08a208eea7a4ddf043cadbb28987cf90ae22':
Dump Keyguard state in SystemUI and PhoneWindowManager
Jorim Jaggi [Sat, 12 Sep 2015 00:45:22 +0000 (17:45 -0700)]
Dump Keyguard state in SystemUI and PhoneWindowManager
Bug:
23970549
Change-Id: Iec1e8ac507268086e0e2935847eda606ea1fb700
Adrian Roos [Fri, 11 Sep 2015 19:38:43 +0000 (12:38 -0700)]
Fix light status bar transitions
Bug:
23971926
Change-Id: Ia3c6fb18d38fb7479028191ad3df8389adb830ec
Alan Viverette [Fri, 11 Sep 2015 22:25:29 +0000 (22:25 +0000)]
am
62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
* commit '
62b94c353a8748ef10691da4844bf894e1155870':
Avoid OOBE when AbsListView layout is out of sync with adapter
Chris Manton [Tue, 1 Sep 2015 20:56:46 +0000 (13:56 -0700)]
Add capability to ignore carrier entitlement checks
Boolean to check to ignore carrier entitlement check.
API to follow later.
Carrier configuration manager has an option
to override tethering entitlement checks.
Ignore entitlement checks if overridden by
the carrier configuration flag.
bug:
23712807
Change-Id: I6c9b3b9994279e592db304debef54809338fe9cf