OSDN Git Service
Vineeta Srivastava [Wed, 2 Sep 2015 07:47:36 +0000 (07:47 +0000)]
am
9edfb36a: am
dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev
* commit '
9edfb36a4bf00f924050ad592dbcecbac3a4cf62':
set config_use_sim_language_file false for KR LGU+/KT
Joshua Schwarz [Wed, 2 Sep 2015 07:41:52 +0000 (07:41 +0000)]
am
258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev
* commit '
258a7cd95e247a01d7dbb02b8858db6aa90ce621':
Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
Vineeta Srivastava [Wed, 2 Sep 2015 07:39:09 +0000 (07:39 +0000)]
am
dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev
* commit '
dd124802a7220a813aeb5afe1b1d6ef1cb7277e2':
set config_use_sim_language_file false for KR LGU+/KT
Vineeta Srivastava [Wed, 2 Sep 2015 07:29:33 +0000 (07:29 +0000)]
Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev
Joshua Schwarz [Wed, 2 Sep 2015 07:27:39 +0000 (07:27 +0000)]
Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev
Hyejin [Thu, 27 Aug 2015 03:26:22 +0000 (20:26 -0700)]
set config_use_sim_language_file false for KR LGU+/KT
BUG=
23611386
Change-Id: Ifb635ccab9994f0bc2c0a75b539f29d71111b1ed
Roshan Pius [Wed, 2 Sep 2015 06:21:46 +0000 (06:21 +0000)]
am
8750f04a: am
a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
* commit '
8750f04a73568b2002cdd50d550822ffb53d5362':
Reformat only KR numbers with leading "+82".
Roshan Pius [Wed, 2 Sep 2015 06:12:56 +0000 (06:12 +0000)]
am
a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
* commit '
a14e900181aa03daa760e3ba6eb1e7e00d438305':
Reformat only KR numbers with leading "+82".
Roshan Pius [Wed, 2 Sep 2015 06:06:45 +0000 (06:06 +0000)]
Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
Selim Cinek [Wed, 2 Sep 2015 01:21:32 +0000 (01:21 +0000)]
am
9e30e202: am
2af5010a: am
36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev
* commit '
9e30e20233136d499447622213e0f383e695dd04':
Fixed a crash in the notification group manager
Deepanshu Gupta [Wed, 2 Sep 2015 01:21:26 +0000 (01:21 +0000)]
am
7209945f: am
0e150a8b: am
0c5fd7e3: am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
7209945fd38d22078b2fd208abe0aa976c311dde':
LayoutLib: Fix typedArray caching.
Selim Cinek [Wed, 2 Sep 2015 01:08:38 +0000 (01:08 +0000)]
am
2af5010a: am
36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev
* commit '
2af5010a6793d27eda86432f1ec3ebbe92e1d99e':
Fixed a crash in the notification group manager
Deepanshu Gupta [Wed, 2 Sep 2015 01:08:34 +0000 (01:08 +0000)]
am
0e150a8b: am
0c5fd7e3: am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
0e150a8b947f657a5875382bd65f37b5a07c0f79':
LayoutLib: Fix typedArray caching.
Joshua Schwarz [Wed, 2 Sep 2015 01:03:18 +0000 (18:03 -0700)]
Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
Change-Id: If2b0797a4bc526e1fdb058d83d4d2bc676875cee
Selim Cinek [Wed, 2 Sep 2015 00:54:32 +0000 (00:54 +0000)]
am
36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev
* commit '
36a75d6aefcddb91df7d513292d346f1f51ec702':
Fixed a crash in the notification group manager
Deepanshu Gupta [Wed, 2 Sep 2015 00:54:26 +0000 (00:54 +0000)]
am
0c5fd7e3: am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
0c5fd7e3791f0b1a3a3b1c1ebe34f568155ba11f':
LayoutLib: Fix typedArray caching.
Jim Miller [Wed, 2 Sep 2015 00:50:41 +0000 (00:50 +0000)]
am
4f7d5dcd: am
be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev
* commit '
4f7d5dcd662cfa4f070fd0547e30060aa65fd734':
Only allow foreground app and keyguard to access FingerprintManager
Jim Miller [Wed, 2 Sep 2015 00:40:40 +0000 (00:40 +0000)]
am
be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev
* commit '
be342fc3c7a21bf22901255ed489a90c00f8bd93':
Only allow foreground app and keyguard to access FingerprintManager
Jim Miller [Wed, 2 Sep 2015 00:32:11 +0000 (00:32 +0000)]
Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev
Selim Cinek [Wed, 2 Sep 2015 00:25:05 +0000 (00:25 +0000)]
Merge "Fixed a crash in the notification group manager" into mnc-dev
Deepanshu Gupta [Wed, 2 Sep 2015 00:11:24 +0000 (00:11 +0000)]
am
eb541727: am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
eb54172719db60740a0b8dde6380db54d4006159':
LayoutLib: Fix typedArray caching.
Selim Cinek [Wed, 2 Sep 2015 00:07:38 +0000 (17:07 -0700)]
Fixed a crash in the notification group manager
When 2 notifications were posted as the summary of the same
group, then the system would eventually crash.
Bug:
23676310
Change-Id: Ia8f95e624f3f43d1b55169dd8102e3c89427dc76
Filip Gruszczynski [Wed, 2 Sep 2015 00:06:38 +0000 (00:06 +0000)]
am
dbf8c0d9: am
991e4936: am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
dbf8c0d9260f83b0d4d60c1dea1fbcd023ee5d29':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Wed, 2 Sep 2015 00:06:32 +0000 (00:06 +0000)]
am
7f2b4b6a: am
7e28b3bc: am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
7f2b4b6a63a6d2d6f7cbd6be9cc86d826fa99107':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Wed, 2 Sep 2015 00:06:24 +0000 (00:06 +0000)]
am
3e64c75f: am
146dc265: am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
3e64c75f33ef1f7876e1ae19fc1af4ff1e7ebdb6':
Fixed when the notification effects are being cleared
Deepanshu Gupta [Tue, 1 Sep 2015 23:59:10 +0000 (23:59 +0000)]
am
dd21212f: am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
dd21212fa1a9c907d5d2f80f3de2413f6c14da7a':
LayoutLib: Fix typedArray caching.
Jim Miller [Tue, 1 Sep 2015 01:18:22 +0000 (18:18 -0700)]
Only allow foreground app and keyguard to access FingerprintManager
Fixes bug
21309357
Fixes bug
23566317
Change-Id: Ie776c36e2cc5c15a8789d76b604a9c7507efb605
Filip Gruszczynski [Tue, 1 Sep 2015 23:49:41 +0000 (23:49 +0000)]
am
991e4936: am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
991e493616a644b6bb7fdea9a99990520d77348a':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Tue, 1 Sep 2015 23:49:37 +0000 (23:49 +0000)]
am
7e28b3bc: am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
7e28b3bced7d6963114f667fc2ec0a13ff64607d':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Tue, 1 Sep 2015 23:49:33 +0000 (23:49 +0000)]
am
146dc265: am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
146dc26511a9a1b82bf62d679b9cae6e8966241f':
Fixed when the notification effects are being cleared
Deepanshu Gupta [Tue, 1 Sep 2015 23:40:40 +0000 (23:40 +0000)]
am
eb26f5ce: LayoutLib: Fix typedArray caching.
* commit '
eb26f5cecd5366b29b3cb746a7edaf3769f40480':
LayoutLib: Fix typedArray caching.
Filip Gruszczynski [Tue, 1 Sep 2015 23:33:58 +0000 (23:33 +0000)]
am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
cbacd4f0cee10b63adf6e2d482e7b4f62c0104a0':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Tue, 1 Sep 2015 23:33:54 +0000 (23:33 +0000)]
am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
f50d4ce6d31c8401b36cbf07df75264bc417519d':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Tue, 1 Sep 2015 23:33:50 +0000 (23:33 +0000)]
am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
9a2d5742bd11c2a7a583d53b1ef1ad12d75e239e':
Fixed when the notification effects are being cleared
Jim Miller [Tue, 1 Sep 2015 23:32:43 +0000 (23:32 +0000)]
am
d050cc87: am
e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
* commit '
d050cc87c865d0ea382132d5669668e7b806ac89':
Fix broken enter key after failed PIN attempts.
Vineeta Srivastava [Tue, 1 Sep 2015 23:32:35 +0000 (23:32 +0000)]
am
53c14ce4: am
860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
* commit '
53c14ce4f1f4b85fa4c4418327353b92fa6b0499':
Do not show roaming icon for NL KPN network with Telfort SIM
Deepanshu Gupta [Wed, 26 Aug 2015 18:54:50 +0000 (11:54 -0700)]
LayoutLib: Fix typedArray caching.
The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.
Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0
Filip Gruszczynski [Tue, 1 Sep 2015 23:11:46 +0000 (23:11 +0000)]
Merge "Don't perform layout while adjusting displays/stacks state." into mnc-dev
Jim Miller [Tue, 1 Sep 2015 23:08:06 +0000 (23:08 +0000)]
am
e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
* commit '
e45761ff901342a538607a3539997b106e867821':
Fix broken enter key after failed PIN attempts.
Vineeta Srivastava [Tue, 1 Sep 2015 23:08:03 +0000 (23:08 +0000)]
am
860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
* commit '
860aa1e1b08ec119c5cc538cb2019ec53a72aeab':
Do not show roaming icon for NL KPN network with Telfort SIM
Eino-Ville Talvala [Tue, 1 Sep 2015 23:06:17 +0000 (23:06 +0000)]
Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
Svetoslav [Tue, 1 Sep 2015 23:01:53 +0000 (23:01 +0000)]
am
dc436aaa: am
69228600: am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
dc436aaaf2f00ddb0faf70ff6dfb8368c8a589f7':
Incorrect app op check in broadcast queue
Selim Cinek [Tue, 1 Sep 2015 23:00:25 +0000 (23:00 +0000)]
Merge "Fixed when the notification effects are being cleared" into mnc-dev
Jim Miller [Tue, 1 Sep 2015 22:58:43 +0000 (22:58 +0000)]
Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
Vineeta Srivastava [Tue, 1 Sep 2015 22:55:54 +0000 (22:55 +0000)]
Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
Svetoslav [Tue, 1 Sep 2015 22:52:09 +0000 (22:52 +0000)]
am
69228600: am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
692286008c197bb2810fcaf9441be5cb6a860ce0':
Incorrect app op check in broadcast queue
Svetoslav [Tue, 1 Sep 2015 22:39:46 +0000 (22:39 +0000)]
am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
fb9ec50795142c24b56dd28e45f5012b9b445380':
Incorrect app op check in broadcast queue
Jim Miller [Tue, 1 Sep 2015 22:21:55 +0000 (15:21 -0700)]
Fix broken enter key after failed PIN attempts.
Fixes bug
23699953
Change-Id: Id099443b830f5608c0bf955075c3407b401f3d53
Svetoslav [Tue, 1 Sep 2015 21:45:18 +0000 (14:45 -0700)]
Incorrect app op check in broadcast queue
An intent broadcaster can specify which permissions should be
held by a receiver to get the broadcast. These permissions may
have corresponding app ops and if this is the case we also
check the app ops. There is a bug in broadcast queue where if
a permission does not have an app op we still try to check this
app op and get an exception as the app op does not exist. This
did not manifest often because the broadcast API takes an
optional app op against which is compared the app op for each
permission and if they differ the app op for the permission is
checked.
bug:
23725305
Change-Id: Iec56ee354bbc11e7bc245134cf3afd2c11eecbc4
Tim Murray [Tue, 1 Sep 2015 21:43:13 +0000 (21:43 +0000)]
am
e20eff91: am
3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev
* commit '
e20eff91a429465bb92e0f3a21d6d7e31f2114df':
Enable migration to big cores for app launches.
Tim Murray [Tue, 1 Sep 2015 21:33:36 +0000 (21:33 +0000)]
am
3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev
* commit '
3491da4eb3714556ac908777be3a55f2e200bf0b':
Enable migration to big cores for app launches.
Tim Murray [Tue, 1 Sep 2015 21:23:38 +0000 (21:23 +0000)]
Merge "Enable migration to big cores for app launches." into mnc-dr-dev
Ruben Brunk [Thu, 27 Aug 2015 21:00:03 +0000 (14:00 -0700)]
DO NOT MERGE: Fix DngCreator default crop calculations.
Bug:
23591407
Bug:
23697593
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
Sungmin Choi [Tue, 1 Sep 2015 18:13:33 +0000 (11:13 -0700)]
Do not show roaming icon for NL KPN network with Telfort SIM
Bug:
23707729
Change-Id: I9c27e814b652c1e3d3a1d75c0f4e51ed153ec3ae
Roshan Pius [Mon, 31 Aug 2015 20:04:14 +0000 (13:04 -0700)]
Reformat only KR numbers with leading "+82".
Looks like the phonenumber util can figure out the country code of a
phone number to format from the localization data even if it is not
explicitly present in the phone number string. So, adding an explicit
check to make sure that the country code(+82) was fetched from the
original number string which was the intention of the fix for
b/
22862845.
BUG:
23661668
Change-Id: I26ba03d759e0ec35a195ba51bf60d09eff8de090
Zhentao Sun [Tue, 1 Sep 2015 00:58:38 +0000 (00:58 +0000)]
am
aa06c808: am
363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev
* commit '
aa06c8089a7d417a240004e785239f00ba1af0ec':
Don't launch the camera if it already in foreground.
Jorim Jaggi [Tue, 1 Sep 2015 00:58:31 +0000 (00:58 +0000)]
am
4a306fd7: am
3a464785: Add a private API to get notified about lockout resets
* commit '
4a306fd744bc2f6f434cb7032580b063b704a9c5':
Add a private API to get notified about lockout resets
Zhentao Sun [Tue, 1 Sep 2015 00:47:04 +0000 (00:47 +0000)]
am
363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev
* commit '
363c694a448d90322936526d78a9878de0003d0e':
Don't launch the camera if it already in foreground.
Jorim Jaggi [Tue, 1 Sep 2015 00:47:00 +0000 (00:47 +0000)]
am
3a464785: Add a private API to get notified about lockout resets
* commit '
3a464785088e7fd206666f640912729533948ce8':
Add a private API to get notified about lockout resets
Zhentao Sun [Tue, 1 Sep 2015 00:40:39 +0000 (00:40 +0000)]
Merge "Don't launch the camera if it already in foreground." into mnc-dr-dev
Jorim Jaggi [Fri, 28 Aug 2015 23:59:13 +0000 (16:59 -0700)]
Add a private API to get notified about lockout resets
SystemUI uses it to start authentication again after lockout reset
expired.
Bug:
22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
Filip Gruszczynski [Mon, 31 Aug 2015 15:57:24 +0000 (08:57 -0700)]
Don't perform layout while adjusting displays/stacks state.
When we detach the stack from the display we are in an inconsistent
state. We need to finish that operation, before we start laying out
things again. Otherwise we will encounter subtle bugs, where stack is
partially closed, but still used during the layout.
Display detachment was already doing the right thing and scheduling a
layout after it finishes the display detach. However, removing the
stack's windows was triggering immediate relayout and causing a crash.
This CL also adds some missing synchronization around
WindowManagerService.mStackIdToStack, which is in most cases protected by
mWindowMap.
Bug:
22191609
Bug:
23615329
Change-Id: I1e2fc42e1a5b673be808acdec473f85f138d7062
Christopher Ferris [Tue, 1 Sep 2015 00:31:30 +0000 (00:31 +0000)]
am
1bc7d0c8: am
70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
* commit '
1bc7d0c84a1fbd27add883b8e000096677a1ca22':
Save/restore errno in SIGCHLD handler.
Christopher Ferris [Tue, 1 Sep 2015 00:23:02 +0000 (00:23 +0000)]
am
70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
* commit '
70c958c414204b195d4195cdcafe33932087e6b1':
Save/restore errno in SIGCHLD handler.
Christopher Ferris [Tue, 1 Sep 2015 00:14:16 +0000 (00:14 +0000)]
Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
Christopher Ferris [Mon, 31 Aug 2015 22:40:01 +0000 (15:40 -0700)]
Save/restore errno in SIGCHLD handler.
The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.
Bug:
23572286
Bug:
23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
Selim Cinek [Mon, 31 Aug 2015 23:15:49 +0000 (16:15 -0700)]
Fixed when the notification effects are being cleared
Previously the notification effects were not correctly cleared in certain
cases and the user could end up in a state where the notification light would
always blink.
Bug:
22931139
Change-Id: I9a71e56cf4479354a9d773b5b6f0edd7693f2b05
Todd Kennedy [Mon, 31 Aug 2015 23:05:49 +0000 (23:05 +0000)]
am
9fe274d6: am
9e25e164: am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
9fe274d638413b7342246836c344b442ebcfa64c':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 23:05:43 +0000 (23:05 +0000)]
am
2d7df3ef: am
d66d4d1b: am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
2d7df3ef8d0fab3887001f1824a537c98a7a2457':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 23:05:34 +0000 (23:05 +0000)]
am
a42870fc: am
188a33c7: am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
a42870fcd6bbd15326fea45e156bd2462bf8a78a':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 22:57:52 +0000 (22:57 +0000)]
am
9e25e164: am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 22:57:47 +0000 (22:57 +0000)]
am
d66d4d1b: am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
d66d4d1bea063acefae6bab5faf822d7a363b216':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:57:44 +0000 (22:57 +0000)]
am
188a33c7: am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
188a33c7acb53fb59364b82a41ec9270f6aef5cf':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 22:45:23 +0000 (22:45 +0000)]
am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
e7078e181cd00d20ce7764efa9835e2604a3cb83':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 22:45:19 +0000 (22:45 +0000)]
am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
627975fca234bfc62d60904547ba3fb2ac675ec8':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:45:15 +0000 (22:45 +0000)]
am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 22:35:58 +0000 (22:35 +0000)]
Merge "Ensure host is set before onInflate()" into mnc-dev
Bart Sears [Mon, 31 Aug 2015 22:32:22 +0000 (22:32 +0000)]
am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
74890df7267d1c203fdbc5e90052f723a3c89f3d':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:32:17 +0000 (22:32 +0000)]
am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
0bafa33fcdebeaf6bdfd36a3f75e461d630b86bc':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:20:06 +0000 (22:20 +0000)]
am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
3cb7e91f2cd1fb29e6d0926e35f90647200c1af4':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)]
am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
35c1eb9e6506b407a1af40359d48bb06d884385d':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:03:48 +0000 (22:03 +0000)]
am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
199c74eab1a30bff7db7bb4d24c161f36edb7f5b':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:03:44 +0000 (22:03 +0000)]
am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
82b70db7dd906013d131737a5bec2ae59b41ae61':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bug:
23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
Tyler Gunn [Mon, 31 Aug 2015 21:25:17 +0000 (21:25 +0000)]
am
6a9baca0: am
7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '
6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2':
Rename carrier config constant.
Tyler Gunn [Mon, 31 Aug 2015 21:14:55 +0000 (21:14 +0000)]
am
7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '
7878eee8a9c20752e038f563b98b6b42c372cd0f':
Rename carrier config constant.
Todd Kennedy [Mon, 31 Aug 2015 21:10:04 +0000 (14:10 -0700)]
Ensure host is set before onInflate()
Bug:
22512520
Change-Id: I70f3b3c3234d7015880e0b83ae13f6fbe218f19a
Tyler Gunn [Mon, 31 Aug 2015 21:01:19 +0000 (21:01 +0000)]
Merge "Rename carrier config constant." into mnc-dr-dev
Selim Cinek [Mon, 31 Aug 2015 20:47:50 +0000 (20:47 +0000)]
am
b8645fa7: am
a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
* commit '
b8645fa79e06c2e5cb87eb7fddccf3d2679c5f71':
Fixed a bug where the secure camera would flash when rotated
Selim Cinek [Mon, 31 Aug 2015 20:37:26 +0000 (20:37 +0000)]
am
a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
* commit '
a7cad8e8a4d698bd3880299265760f5158073e2d':
Fixed a bug where the secure camera would flash when rotated
Adrian Roos [Mon, 31 Aug 2015 20:27:55 +0000 (20:27 +0000)]
am
7e1775d2: am
78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '
7e1775d246371422ae60ec4d825d70bc067a8962':
Disable fingerprint after force lock
Bart Sears [Mon, 31 Aug 2015 20:27:49 +0000 (20:27 +0000)]
am
02be9316: am
06fb3b2d: am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
02be93160a246323f0a17f831e4e8bf56d65d415':
Don't throttle "while idle" alarms while not dozing
Selim Cinek [Mon, 31 Aug 2015 20:27:48 +0000 (20:27 +0000)]
Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
Adrian Roos [Mon, 31 Aug 2015 20:16:57 +0000 (20:16 +0000)]
am
78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '
781953123e5b0f0f85691eabc13b3430c3054a10':
Disable fingerprint after force lock
Bart Sears [Mon, 31 Aug 2015 20:16:53 +0000 (20:16 +0000)]
am
06fb3b2d: am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
06fb3b2da8a57fdc5efe24ab9464e6e890740de6':
Don't throttle "while idle" alarms while not dozing
Tyler Gunn [Mon, 31 Aug 2015 20:15:27 +0000 (13:15 -0700)]
Rename carrier config constant.
Bug:
23063217
Change-Id: I0050f0009a7681df1b04edbbd9331bc2918464a2
Tyler Gunn [Mon, 31 Aug 2015 20:07:46 +0000 (20:07 +0000)]
am
3bd58233: am
d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
* commit '
3bd58233ab3ec8509a3f8922344ae30a330f5159':
Add carrier config for allowing non-emerg calls in ECM mode.
Adrian Roos [Mon, 31 Aug 2015 20:04:46 +0000 (20:04 +0000)]
Merge "Disable fingerprint after force lock" into mnc-dr-dev
Bart Sears [Mon, 31 Aug 2015 20:02:34 +0000 (20:02 +0000)]
am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
0e2e85898743a070a0c42036fa9d841694819a00':
Don't throttle "while idle" alarms while not dozing