OSDN Git Service
Dan Sandler [Sat, 15 Aug 2015 22:33:29 +0000 (18:33 -0400)]
resolved conflicts (again!) for merge of
8ad3e817 to mnc-dr-dev
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
Daniel Sandler [Sat, 15 Aug 2015 04:16:41 +0000 (00:16 -0400)]
resolved conflicts for merge of
8ad3e817 to mnc-dr-dev
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
Daniel Sandler [Fri, 14 Aug 2015 19:59:35 +0000 (19:59 +0000)]
Merge ""I tried to think of the most harmless thing."" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 19:47:54 +0000 (19:47 +0000)]
am
504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
* commit '
504600bb09e51f0187d81cacb1dc2de77c6256b6':
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
Dan Sandler [Mon, 3 Aug 2015 21:42:54 +0000 (17:42 -0400)]
"I tried to think of the most harmless thing."
Bug:
21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
Julia Reynolds [Fri, 14 Aug 2015 19:22:04 +0000 (19:22 +0000)]
am
7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
* commit '
7df411d0cced4a849bcdca58fa3c27eb731e0862':
Clear calling identity before getting the current user.
Julia Reynolds [Fri, 14 Aug 2015 19:17:31 +0000 (19:17 +0000)]
Merge "Clear calling identity before getting the current user." into mnc-dev
Jorim Jaggi [Thu, 13 Aug 2015 01:35:42 +0000 (18:35 -0700)]
Start pulse fading exactly when screen is turned on
Bug:
23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b
Jean-Michel Trivi [Fri, 14 Aug 2015 18:33:08 +0000 (18:33 +0000)]
am
16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
* commit '
16fa58cb133f539016a5e013897c7de7f58ff16d':
Fix to check the incoming userid argument for RingtonePlayer
Jean-Michel Trivi [Fri, 14 Aug 2015 18:19:17 +0000 (18:19 +0000)]
Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:15:37 +0000 (17:15 +0000)]
am
7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
Make "Ask every time" actually work that way
Dianne Hackborn [Fri, 14 Aug 2015 17:15:33 +0000 (17:15 +0000)]
am
81f3a85a: Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '
81f3a85aa29d83ed1a5de4de1006587d375a1c77':
Fix issue #
22940169: "pm grant" can no longer grant permissions...
Chris Tate [Fri, 14 Aug 2015 17:11:30 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Dianne Hackborn [Fri, 14 Aug 2015 17:06:20 +0000 (17:06 +0000)]
Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
Svetoslav Ganov [Fri, 14 Aug 2015 15:13:38 +0000 (15:13 +0000)]
am
b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
* commit '
b045331fcb033507072bfd7899a147bb2be7176e':
Add GTS test to ensure valid default permission grants - framework
Svetoslav Ganov [Fri, 14 Aug 2015 15:06:16 +0000 (15:06 +0000)]
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 05:06:31 +0000 (22:06 -0700)]
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
System UIDs are also run as shared GIDs, so this should not throw
an exception.
Bug:
23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
Christopher Tate [Thu, 13 Aug 2015 23:29:33 +0000 (16:29 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
Dianne Hackborn [Fri, 14 Aug 2015 01:25:20 +0000 (18:25 -0700)]
Fix issue #
22940169: "pm grant" can no longer grant permissions...
...with protection flag PROTECTION_FLAG_DEVELOPMENT
Bring back the old grant/revoke code for development permissions.
Also some more dumpsys output to help debugging.
And new dumpsys command for checking a permission.
Change-Id: I6e27e62a9ca5ec1ecc0f102714a448ea02f0f41c
Jeff Sharkey [Fri, 14 Aug 2015 01:24:44 +0000 (01:24 +0000)]
am
cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit '
cfcf6af915bee878bdaea04f48592bbbe506ad26':
Method to show DialogFragment allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Method to show DialogFragment allowing state loss." into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 01:16:52 +0000 (01:16 +0000)]
am
37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '
37dd5240ad54494e028d6b2973729f5cb40ccad9':
Doc change: Update preview pages for dp3.
Joe Fernandez [Fri, 14 Aug 2015 01:10:56 +0000 (01:10 +0000)]
Merge "Doc change: Update preview pages for dp3." into mnc-dev
Sungmin Choi [Sat, 8 Aug 2015 01:12:19 +0000 (18:12 -0700)]
Fix to check the incoming userid argument for RingtonePlayer
In PowerNotificationWarnings, where it dispatches notifications
with UserHandle.ALL:
mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
The fix is to have RingtonePlayer check the incoming userId argument to playAsync(),
and change USER_ALL to USER_OWNER.
BUG=
22516181
BUG=
22992637
Change-Id: Ia3f8aaa2bee7fb15c24542e2331b2bc5a877e715
Jorim Jaggi [Thu, 13 Aug 2015 23:58:29 +0000 (23:58 +0000)]
am
81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '
81eeef589386483722c21572d9ab6d3f95dd26be':
Update time when turning on screen, in addition to waking up
Jeff Sharkey [Thu, 13 Aug 2015 23:57:29 +0000 (16:57 -0700)]
Method to show DialogFragment allowing state loss.
Same as show(), but allowing state loss.
Bug:
22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
Jorim Jaggi [Thu, 13 Aug 2015 23:51:11 +0000 (23:51 +0000)]
Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
Jorim Jaggi [Thu, 13 Aug 2015 22:53:14 +0000 (15:53 -0700)]
Update time when turning on screen, in addition to waking up
When in ambient display mode, we didn't get a callback to
onStartedWakingUp, thus the time was never refreshed. Since
broadcasts are disabled in this low-power state, we need to refresh
the clock manually before turning on the screen, because we can't
rely on the broadcasts to be delivered.
Bug:
23171638
Change-Id: I249f4195a14995f7c1467e73ac2aa400b871f80e
Joe Fernandez [Thu, 13 Aug 2015 18:55:46 +0000 (18:55 +0000)]
am
f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '
f75577295765ca13bf3d0d5bffa81b569cb88da2':
docs: Update uses-sdk-element page with API 23 (M) listing
Joe Fernandez [Thu, 13 Aug 2015 18:49:40 +0000 (18:49 +0000)]
Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
Joe Fernandez [Thu, 13 Aug 2015 18:45:23 +0000 (11:45 -0700)]
docs: Update uses-sdk-element page with API 23 (M) listing
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
Joe Fernandez [Thu, 13 Aug 2015 18:33:47 +0000 (18:33 +0000)]
am
8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '
8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
docs: Update developer docs make file to include API 23
Joe Fernandez [Thu, 13 Aug 2015 18:27:11 +0000 (18:27 +0000)]
Merge "docs: Update developer docs make file to include API 23" into mnc-dev
Dirk Dougherty [Thu, 13 Aug 2015 16:55:30 +0000 (09:55 -0700)]
Doc change: Update preview pages for dp3.
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
Mike Dodd [Thu, 13 Aug 2015 15:22:48 +0000 (15:22 +0000)]
am
226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
226ae04df4b3570d11b66d52a404b2c8b2ac50db':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
Mike Dodd [Thu, 13 Aug 2015 15:16:39 +0000 (15:16 +0000)]
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
Jason Monk [Thu, 13 Aug 2015 14:44:55 +0000 (14:44 +0000)]
am
90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '
90460c79d1af214e73428eac92b5761e743dec4d':
Add more intelligence to bluetooth connection state
Jason Monk [Thu, 13 Aug 2015 14:38:46 +0000 (14:38 +0000)]
Merge "Add more intelligence to bluetooth connection state" into mnc-dev
Julia Reynolds [Thu, 13 Aug 2015 13:01:33 +0000 (09:01 -0400)]
Clear calling identity before getting the current user.
This is necessary so non-privilged apps can call setInterruptionFilter.
Bug:
23156657
Change-Id: Ia903a39626c93957276d66805446cd25a91341b5
Bart Sears [Thu, 13 Aug 2015 05:39:02 +0000 (05:39 +0000)]
am
bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit '
bd29b07eab3956796a7a09d7612e42e22616f458':
Fix Keyguard drawn timeout
Bart Sears [Thu, 13 Aug 2015 05:32:14 +0000 (05:32 +0000)]
Merge "Fix Keyguard drawn timeout" into mnc-dev
Svet Ganov [Tue, 11 Aug 2015 15:59:12 +0000 (08:59 -0700)]
Add GTS test to ensure valid default permission grants - framework
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.
bug:
23043018
Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
Joe Fernandez [Thu, 13 Aug 2015 02:45:22 +0000 (19:45 -0700)]
docs: Update developer docs make file to include API 23
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
Jorim Jaggi [Thu, 13 Aug 2015 01:58:55 +0000 (01:58 +0000)]
Merge "Do not vibrate if we don't have a fingerprint client" into mnc-dr-dev
Jorim Jaggi [Thu, 13 Aug 2015 01:06:22 +0000 (18:06 -0700)]
Do not vibrate if we don't have a fingerprint client
Bug:
22851337
Change-Id: Ia7be6eda2db08b4df07a48ffa4d24637f59167e9
Jorim Jaggi [Thu, 13 Aug 2015 00:56:14 +0000 (00:56 +0000)]
Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
Jorim Jaggi [Thu, 13 Aug 2015 00:56:04 +0000 (00:56 +0000)]
Merge "Require strong authentication after a timeout" into mnc-dr-dev
Dianne Hackborn [Thu, 13 Aug 2015 00:54:35 +0000 (00:54 +0000)]
am
ff9912d5: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
ff9912d594bc5cdc10a4a224b9a2296bac50851b':
Fix issue #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:59 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 00:00:13 +0000 (00:00 +0000)]
am
c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev
* commit '
c97509c0292910d7fb27e4c890ad4bc0ea723fec':
Update ifaces when global restriction changes.
Jeff Sharkey [Wed, 12 Aug 2015 23:51:55 +0000 (23:51 +0000)]
Merge "Update ifaces when global restriction changes." into mnc-dev
Jeff Sharkey [Wed, 12 Aug 2015 23:46:05 +0000 (16:46 -0700)]
Update ifaces when global restriction changes.
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces. In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.
This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.
Bug:
23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
Jorim Jaggi [Wed, 12 Aug 2015 02:30:46 +0000 (19:30 -0700)]
Fix touch-to-wake while dozing
Bug:
23113439
Change-Id: I7abcf1b4298fc832ba78df742c691246766993b1
Jorim Jaggi [Tue, 11 Aug 2015 22:54:06 +0000 (15:54 -0700)]
Require strong authentication after a timeout
Bug:
21594472
Change-Id: Iab169d4fa2e4ad134f8c8579654b28e96b5b1385
Roshan Pius [Wed, 12 Aug 2015 23:12:24 +0000 (23:12 +0000)]
Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:10:58 +0000 (16:10 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
Mike Dodd [Tue, 11 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/
23110861
Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
Raph Levien [Wed, 12 Aug 2015 21:07:43 +0000 (21:07 +0000)]
am
beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit '
beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
Roshan Pius [Wed, 12 Aug 2015 19:01:42 +0000 (12:01 -0700)]
Add a new carrier config for DTMF tone gap.
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.
BUG:
23064351
Change-Id: I3a0e20efecd62f533e796a40097f181d4c20d614
Raph Levien [Wed, 12 Aug 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
Eino-Ville Talvala [Wed, 12 Aug 2015 20:18:46 +0000 (20:18 +0000)]
am
242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
* commit '
242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
Camera: Fix framework bugs with DEPTH-only camera devices
Jason Monk [Wed, 12 Aug 2015 20:17:34 +0000 (16:17 -0400)]
Add more intelligence to bluetooth connection state
Since bluetooth connection state has a mind of its own... If we
think we are connected, but we don't actually know about any devices
that are currently connected, we probably aren't. So set the state
that way, and let everyone know.
Bug:
22977827
Change-Id: I9266f5394b179a3917b3818839f7c6b2dc238376
Clara Bayarri [Wed, 12 Aug 2015 18:46:47 +0000 (19:46 +0100)]
Fix Insertion ActionMode not showing on RTL languages
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.
The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.
After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.
BUG:
22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
Eino-Ville Talvala [Wed, 12 Aug 2015 20:01:44 +0000 (20:01 +0000)]
Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:59:05 +0000 (18:59 +0000)]
am
ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
* commit '
ad285c169fd55bee8feef6e076a6710c357043e5':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
Mike Dodd [Wed, 12 Aug 2015 18:53:48 +0000 (18:53 +0000)]
Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:31 +0000 (18:48 +0000)]
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
This reverts commit
3a24898f5553e72589eaba3aeb5ef8f63909dd64.
Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
Adrian Roos [Wed, 12 Aug 2015 18:16:32 +0000 (18:16 +0000)]
am
c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
* commit '
c0a4883d58554c84d10911da20f43be149b47c53':
Prevent overlap of color views in landscape
Adrian Roos [Wed, 12 Aug 2015 18:06:42 +0000 (18:06 +0000)]
Merge "Prevent overlap of color views in landscape" into mnc-dev
Jason Monk [Wed, 12 Aug 2015 18:06:18 +0000 (18:06 +0000)]
am
0c762957: Merge "Fix tuner for secondary users" into mnc-dev
* commit '
0c7629579184f85d36a4854e7c6f5b81f5b7299e':
Fix tuner for secondary users
Geoff Mendal [Wed, 12 Aug 2015 18:03:39 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Jason Monk [Wed, 12 Aug 2015 17:59:22 +0000 (17:59 +0000)]
Merge "Fix tuner for secondary users" into mnc-dev
Geoff Mendal [Wed, 12 Aug 2015 17:51:55 +0000 (10:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fc5ccb494ee7b446489bcee8ecd733790c92779
Auto-generated-cl: translation import
Mike Dodd [Wed, 12 Aug 2015 17:43:55 +0000 (17:43 +0000)]
am
7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
7f2f96cce3f1663e3c1dccdde2c0f196b2b16e72':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
Todd Kennedy [Wed, 12 Aug 2015 17:43:52 +0000 (17:43 +0000)]
am
24e4d48f: Merge "Promote system app permissions" into mnc-dev
* commit '
24e4d48f56a6fca6974c5670b88a7b4da2180331':
Promote system app permissions
Michael Wright [Wed, 12 Aug 2015 17:43:48 +0000 (17:43 +0000)]
am
e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev
* commit '
e20493ea5affdc417db1fc3fbb527781d6e51612':
Log last filtered sensor timestamp.
Mike Dodd [Wed, 12 Aug 2015 17:01:25 +0000 (17:01 +0000)]
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
Todd Kennedy [Wed, 12 Aug 2015 16:51:13 +0000 (16:51 +0000)]
Merge "Promote system app permissions" into mnc-dev
Michael Wright [Wed, 12 Aug 2015 16:32:11 +0000 (16:32 +0000)]
Merge "Log last filtered sensor timestamp." into mnc-dev
Michael Wright [Wed, 12 Aug 2015 14:35:31 +0000 (15:35 +0100)]
Log last filtered sensor timestamp.
Bug:
22870354
Change-Id: Ib4efaa0f05bec81856c939c5c640eceff98d88ed
Todd Kennedy [Wed, 12 Aug 2015 15:26:15 +0000 (08:26 -0700)]
Promote system app permissions
When upgrading from a pre-M version of Android, install permissions for
exisiting system are promoted to runtime permissions. This only happens
for apps that existed prior to the OTA. Other system apps targeting M
are not automatically granted any permissions.
Bug:
22970710
Change-Id: I964ee3f93c66ea43fbb1be6b5ac6b09ddea3c385
Narayan Kamath [Wed, 12 Aug 2015 10:39:13 +0000 (10:39 +0000)]
am
bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
* commit '
bf88205bef88f78ade5c6830e6203aa343387820':
Fall back to persist.sys.language/country if locale isn't set.
Narayan Kamath [Tue, 11 Aug 2015 14:40:34 +0000 (15:40 +0100)]
Fall back to persist.sys.language/country if locale isn't set.
This will prevent users from losing their language setting when they
take an OTA to M.
bug:
23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
Alex Klyubin [Wed, 12 Aug 2015 05:46:35 +0000 (05:46 +0000)]
am
e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
* commit '
e19b76cbb50db816c535d6d4a5bf125f52c04eba':
Add more examples of generating/importing keys to Javadocs.
Alex Klyubin [Wed, 12 Aug 2015 05:42:29 +0000 (05:42 +0000)]
Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
Lorenzo Colitti [Wed, 12 Aug 2015 03:45:30 +0000 (03:45 +0000)]
am
e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev
* commit '
e022cb085f6ebc2801f843bb47c9fd23f6daa3ea':
Don't attempt to stop the receive thread if we never started it.
Lorenzo Colitti [Wed, 12 Aug 2015 03:38:57 +0000 (03:38 +0000)]
Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:20:43 +0000 (18:20 -0700)]
Fix Keyguard drawn timeout
The timeout for waiting for Keyguard drawn was posted at the wrong
place. If the screen was turning on but the device wasn't waking up,
like in doze mode, we didn't post the timeout, thus, if Keyguard
wouldn't notify us, we would never unblock the screen. This doesn't
really cause a user visible bug but it *could*
prevent the screen from turning on if Keyguard doesn't behave nicely.
Put it at the right place so I can sleep better.
Bug:
21855614
Change-Id: Icda31399261b4ee80c292ce09a0858b0127e2999
Carlos Valdivia [Wed, 12 Aug 2015 01:47:11 +0000 (01:47 +0000)]
am
968fc3ab: Merge "Fix deadlock." into mnc-dev
* commit '
968fc3ab75b0de71f298c6241cab1be1e6d5c86e':
Fix deadlock.
Carlos Valdivia [Wed, 12 Aug 2015 01:42:19 +0000 (01:42 +0000)]
Merge "Fix deadlock." into mnc-dev
Julia Reynolds [Wed, 12 Aug 2015 01:25:03 +0000 (01:25 +0000)]
am
77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
* commit '
77b0d6e9f001c5e08fa367bff3b3e501ab36cc77':
New landscape Navigation bar icons.
Julia Reynolds [Wed, 12 Aug 2015 01:19:01 +0000 (01:19 +0000)]
Merge "New landscape Navigation bar icons." into mnc-dev
Selim Cinek [Wed, 12 Aug 2015 00:56:30 +0000 (00:56 +0000)]
Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev
Filip Gruszczynski [Wed, 12 Aug 2015 00:49:31 +0000 (00:49 +0000)]
am
59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev
* commit '
59123b9b2d7b26e7f49c77b4c62d48dc1a28518f':
When closing task stack remove reference to display content.
Filip Gruszczynski [Wed, 12 Aug 2015 00:40:50 +0000 (00:40 +0000)]
Merge "When closing task stack remove reference to display content." into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 00:37:25 +0000 (00:37 +0000)]
am
15f704e7: Merge "Fix issue #
23122445: Add 420 density" into mnc-dev
* commit '
15f704e70a0fc02f50f0b618b19147ca09c5e421':
Fix issue #
23122445: Add 420 density
Wale Ogunwale [Wed, 12 Aug 2015 00:37:20 +0000 (00:37 +0000)]
am
e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
* commit '
e43d43c391a5b531aead1eae0156a66a3d924fd1':
Fixed issue with moveTaskToBack on single stack devices
Adrian Roos [Wed, 12 Aug 2015 00:36:43 +0000 (17:36 -0700)]
Prevent overlap of color views in landscape
Removes overlap from the color views which resulted in subotimal looks
when both color views were translucent and the nav bar was on the right
edge.
Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e
where the navigation-bar-on-right-side case got forgotten and caused
flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar
was visible.
Bug:
22876533
Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
Dianne Hackborn [Wed, 12 Aug 2015 00:34:56 +0000 (00:34 +0000)]
Merge "Fix issue #
23122445: Add 420 density" into mnc-dev