OSDN Git Service
Adrian Roos [Fri, 24 Jul 2015 03:07:16 +0000 (03:07 +0000)]
am
a9777e47: am
f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '
a9777e47848c7664472719086eb2696b7fbab8a9':
Fix cut off charging indication in certain scripts
Dianne Hackborn [Fri, 24 Jul 2015 03:07:11 +0000 (03:07 +0000)]
am
a45fc6e2: am
5507bb41: Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
* commit '
a45fc6e2ae855756ce71c9021c677cc06422de5a':
Fix issue #
22653116: Google App crashing on NYT app
Svetoslav Ganov [Fri, 24 Jul 2015 03:07:03 +0000 (03:07 +0000)]
am
586116a5: am
41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '
586116a59ea09ec40e31a0972b629caac6348549':
Do not show normal permissions in sideloading UI
Fyodor Kupolov [Fri, 24 Jul 2015 03:06:55 +0000 (03:06 +0000)]
am
c00d2713: am
a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '
c00d2713b9ca072ad9809303c26ae54300b1f8bd':
Fixed a typo
Adam Lesinski [Fri, 24 Jul 2015 03:06:51 +0000 (03:06 +0000)]
am
a403d5cc: am
05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit '
a403d5ccfb4a6e455c794ad73a5fa242883e244f':
UsageStats: Gracefully handle corrupt filenames
Adrian Roos [Fri, 24 Jul 2015 03:06:45 +0000 (03:06 +0000)]
am
6857305f: am
7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit '
6857305f9112b62527f1432f88812f9149492a62':
Protect demo mode commands with permission
Jae Seo [Fri, 24 Jul 2015 03:06:40 +0000 (03:06 +0000)]
am
d8162e47: am
eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit '
d8162e47a3a099961c2eb9fd5310de55c2e8a466':
TIF: Enable hardware acceleration on overlay
Svetoslav Ganov [Fri, 24 Jul 2015 03:06:32 +0000 (03:06 +0000)]
am
cc3c6dbf: am
3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '
cc3c6dbf1e2f33f085c0b885df9653f54337bef6':
Add a privileged permission to get user accounts
John Reck [Fri, 24 Jul 2015 03:06:27 +0000 (03:06 +0000)]
am
3328fe58: am
3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '
3328fe58a156f4b5452418f29f46e2d67dbcbd82':
Fix ATLAS_MAP_ENTRY_FIELD_COUNT
Adam Lesinski [Fri, 24 Jul 2015 03:06:22 +0000 (03:06 +0000)]
am
92638a0c: am
6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '
92638a0ca9c7c2125c624e457e79088b9892d4e0':
BatteryStats: Use English locale for dump and checkin data
Nick Kralevich [Fri, 24 Jul 2015 03:06:14 +0000 (03:06 +0000)]
am
dd856a3f: am
3b0bbd7b: Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
* commit '
dd856a3f0df6e076b815ae208f000e28de235353':
UsbDeviceManager: fix b/
21429947 regression
Chris Wren [Fri, 24 Jul 2015 03:06:09 +0000 (03:06 +0000)]
am
e6deaca6: am
db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit '
e6deaca693c530f7cc3298efc2c53849b9e6cd01':
Don't crash sysui when advisory calls fail.
Tim Kilbourn [Fri, 24 Jul 2015 03:06:04 +0000 (03:06 +0000)]
am
ad49498e: am
1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit '
ad49498e91883099ffda2155e96ebaf495ba579a':
Miss USB device Interface from UsbManager.getDeviceList().
Alan Viverette [Fri, 24 Jul 2015 03:05:58 +0000 (03:05 +0000)]
am
be01800d: am
9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
* commit '
be01800d76ac786a4617e1cecac71c297acf23e4':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
Fyodor Kupolov [Fri, 24 Jul 2015 03:05:53 +0000 (03:05 +0000)]
am
2a37b2ff: am
5ef70b02: Merge "Added a note about location permission" into mnc-dev
* commit '
2a37b2fff27c67454a59048c286b2a7e6329eb07':
Added a note about location permission
xin He [Fri, 24 Jul 2015 03:05:47 +0000 (03:05 +0000)]
am
13bb6812: am
15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '
13bb68122fae6cded11e576c41a81cd2baffb3f7':
Angler Should Not Use Channel 11 for SoftAP
Jeff Sharkey [Fri, 24 Jul 2015 03:05:42 +0000 (03:05 +0000)]
am
e87dc6db: am
f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '
e87dc6dba58e55c60f387a86468a57a5109a97ac':
More info to support CTS, fix reconcile bug.
Jason Monk [Fri, 24 Jul 2015 03:05:33 +0000 (03:05 +0000)]
am
72548325: am
4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '
72548325019cc168a5d98fe7de93dc9ee679a4b7':
Add metrics to tuner
Move tuner enable point to QS
Jorim Jaggi [Fri, 24 Jul 2015 03:05:28 +0000 (03:05 +0000)]
am
5091ca9c: am
ac73f1ef: Partially fix that beginning of animation is skipped
* commit '
5091ca9c825c32336ce42d7b70eef323ddb9cb3c':
Partially fix that beginning of animation is skipped
Dianne Hackborn [Fri, 24 Jul 2015 03:05:22 +0000 (03:05 +0000)]
am
419f2177: am
6f64e737: Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '
419f2177c8565f80489d00463aea630568251f4d':
Fix issue #
22612630: Ensure SMS/Call delivery during Doze
Zhentao Sun [Thu, 23 Jul 2015 19:21:29 +0000 (19:21 +0000)]
am
c6cd1f9a: Added service that listens for gestures.
* commit '
c6cd1f9a83b2807ef7434b6775a07e1e9208d4e0':
Added service that listens for gestures.
Adrian Roos [Thu, 23 Jul 2015 19:21:24 +0000 (19:21 +0000)]
am
58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev
* commit '
58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
Send BATTERY_CHANGED if maxChargingCurrent changes
Fred Chung [Thu, 23 Jul 2015 19:21:19 +0000 (19:21 +0000)]
am
9478ddfa: am
db71828c: am
2c3b9fb8: am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
9478ddfa11a2f16e3234d4c6251fffa0d8527936':
Doc change: add note about not exiting on onPause().
Dianne Hackborn [Thu, 23 Jul 2015 19:21:14 +0000 (19:21 +0000)]
am
86350411: am
b7394671: Merge "Work on issue #
22303510: Additional permissions aren\'t properly..." into mnc-dev
* commit '
863504111546fb46fcb5af356efb267c8582018a':
Work on issue #
22303510: Additional permissions aren't properly...
Alex Klyubin [Thu, 23 Jul 2015 19:21:07 +0000 (19:21 +0000)]
am
568e67a3: am
ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
* commit '
568e67a322deb027480fb85e6d4082b78d907d57':
Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
Wale Ogunwale [Thu, 23 Jul 2015 19:21:02 +0000 (19:21 +0000)]
am
aecf9ba8: am
ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
* commit '
aecf9ba839d440fb89055bcb8454cf72d0afaf41':
Fixed issue with not finding existing activity for background user
Kenny Guy [Thu, 23 Jul 2015 19:20:57 +0000 (19:20 +0000)]
am
2adcb40d: am
2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '
2adcb40d2ce3706543f3e545ce93e9231b94971c':
Support waiting for adb shell am stop-user to complete.
Jason Monk [Thu, 23 Jul 2015 19:20:53 +0000 (19:20 +0000)]
am
1df7e135: am
41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev
* commit '
1df7e135196ca3c8a6a51a9b741e12782afa039c':
Fix blank tiles on QS rotate
Jason Monk [Thu, 23 Jul 2015 19:20:48 +0000 (19:20 +0000)]
am
67091f46: am
a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev
* commit '
67091f46fa16537563a6c095a5bd044499bc2ea5':
Fix crash in NetworkControllerImpl
Jim Miller [Thu, 23 Jul 2015 19:20:41 +0000 (19:20 +0000)]
am
4a31ee0a: am
091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.
* commit '
4a31ee0a745e048a2c9c4db1444404373c1d606b':
Make FingerprintService more tolerant of fingerprintd crashes.
Svetoslav Ganov [Thu, 23 Jul 2015 19:20:37 +0000 (19:20 +0000)]
am
010b53c0: am
bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev
* commit '
010b53c029eac203c445d81ecfca01c242111365':
Update permission icons to final versions - framework
George Mount [Thu, 23 Jul 2015 19:20:32 +0000 (19:20 +0000)]
am
27fbd360: am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
27fbd360a8256cf6321da9ba29bab02b3d241aba':
Null checks to prevent NPEs in Fragments transactions.
Jorim Jaggi [Thu, 23 Jul 2015 19:20:27 +0000 (19:20 +0000)]
am
fcf9acb9: am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
fcf9acb95a536f939a418529f642e60f51f5886a':
Add callback to voice interaction session for lockscreen shown
Adrian Roos [Thu, 23 Jul 2015 19:20:22 +0000 (19:20 +0000)]
am
b30f841c: resolved conflicts for merge of
c1244a29 to mnc-dr-dev
* commit '
b30f841cb44e132598939b0797dad41f6c0004a7':
Touch, wake and unlock
Adrian Roos [Thu, 23 Jul 2015 19:19:47 +0000 (19:19 +0000)]
am
f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '
f21706440499df8076f6cd14955e09cb461baf2d':
Fix cut off charging indication in certain scripts
Dianne Hackborn [Thu, 23 Jul 2015 19:19:43 +0000 (19:19 +0000)]
am
5507bb41: Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
* commit '
5507bb41b0cb11fe36573d59dc4ec8ed03cf7715':
Fix issue #
22653116: Google App crashing on NYT app
Svetoslav Ganov [Thu, 23 Jul 2015 19:19:38 +0000 (19:19 +0000)]
am
41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '
41a62e111d8de8e64ffc61c176add6cc6217b960':
Do not show normal permissions in sideloading UI
Fyodor Kupolov [Thu, 23 Jul 2015 19:19:34 +0000 (19:19 +0000)]
am
a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '
a0a71d8a221d4f3896c7b0d3b2b87eba4e7a77f7':
Fixed a typo
Adam Lesinski [Thu, 23 Jul 2015 19:19:28 +0000 (19:19 +0000)]
am
05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit '
05f5cb45997fdc8831798bb84e50854cdfab2bcb':
UsageStats: Gracefully handle corrupt filenames
Adrian Roos [Thu, 23 Jul 2015 19:19:23 +0000 (19:19 +0000)]
am
7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit '
7748ea5fcd0fc32eeae1475e1871835a5aa39a5a':
Protect demo mode commands with permission
Jae Seo [Thu, 23 Jul 2015 19:19:19 +0000 (19:19 +0000)]
am
eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit '
eec3d9e368328d6ca6942ae2fbd94711ecd7adc8':
TIF: Enable hardware acceleration on overlay
Svetoslav Ganov [Thu, 23 Jul 2015 19:19:14 +0000 (19:19 +0000)]
am
3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '
3d6f606031da248a3b1fd6f0f569ac33a26c0b5e':
Add a privileged permission to get user accounts
John Reck [Thu, 23 Jul 2015 19:19:06 +0000 (19:19 +0000)]
am
3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '
3f2c51084b9d9578532c8a88e7a5444eeedc86c2':
Fix ATLAS_MAP_ENTRY_FIELD_COUNT
Adam Lesinski [Thu, 23 Jul 2015 19:18:59 +0000 (19:18 +0000)]
am
6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '
6625047a3ba26ecc52bb2757eb7576027949e435':
BatteryStats: Use English locale for dump and checkin data
Nick Kralevich [Thu, 23 Jul 2015 19:18:55 +0000 (19:18 +0000)]
am
3b0bbd7b: Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
* commit '
3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237':
UsbDeviceManager: fix b/
21429947 regression
Chris Wren [Thu, 23 Jul 2015 19:18:50 +0000 (19:18 +0000)]
am
db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit '
db2b4ba69db391c3703277ccb986524c072be5f5':
Don't crash sysui when advisory calls fail.
Tim Kilbourn [Thu, 23 Jul 2015 19:18:46 +0000 (19:18 +0000)]
am
1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit '
1aadfc2bc46a14b6c95dc45ec11c4191cac5062d':
Miss USB device Interface from UsbManager.getDeviceList().
Alan Viverette [Thu, 23 Jul 2015 19:18:42 +0000 (19:18 +0000)]
am
9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
* commit '
9478bf0e6f9618b8a5b844deaf548fc5ad1ff024':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
Fyodor Kupolov [Thu, 23 Jul 2015 19:18:34 +0000 (19:18 +0000)]
am
5ef70b02: Merge "Added a note about location permission" into mnc-dev
* commit '
5ef70b02ead0a1e164370fefaff27bfd1ce0d492':
Added a note about location permission
xin He [Thu, 23 Jul 2015 19:18:30 +0000 (19:18 +0000)]
am
15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '
15a45e02c3372ad5deae0a260f782cd3e5a81d58':
Angler Should Not Use Channel 11 for SoftAP
Jeff Sharkey [Thu, 23 Jul 2015 19:18:25 +0000 (19:18 +0000)]
am
f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '
f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
More info to support CTS, fix reconcile bug.
Jason Monk [Thu, 23 Jul 2015 19:18:20 +0000 (19:18 +0000)]
am
4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '
4fc1b707442451f4a826929fc7e72967d443c73f':
Add metrics to tuner
Move tuner enable point to QS
Jorim Jaggi [Thu, 23 Jul 2015 19:18:15 +0000 (19:18 +0000)]
am
ac73f1ef: Partially fix that beginning of animation is skipped
* commit '
ac73f1efea0cb23881571e18e87ffc7f388af7ad':
Partially fix that beginning of animation is skipped
Dianne Hackborn [Thu, 23 Jul 2015 19:18:10 +0000 (19:18 +0000)]
am
6f64e737: Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '
6f64e737f046cd9ae13e260027781acfabaa4cba':
Fix issue #
22612630: Ensure SMS/Call delivery during Doze
Adrian Roos [Thu, 23 Jul 2015 00:50:55 +0000 (00:50 +0000)]
Merge "Fix cut off charging indication in certain scripts" into mnc-dev
Zhentao Sun [Wed, 22 Jul 2015 00:43:53 +0000 (17:43 -0700)]
Added service that listens for gestures.
Added the GestureLauncherService that listens for camera launch gesture
and starts the camera app.
OEMs need to specify the sensor type of the camera launch gesture in
their overlays.
In the future, we can add more gesture support in this service.
Change-Id: I0769e7ca71e08bd9159aacf29bdcefd316efd2f0
Dianne Hackborn [Thu, 23 Jul 2015 00:35:34 +0000 (00:35 +0000)]
Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
Svetoslav Ganov [Thu, 23 Jul 2015 00:27:16 +0000 (00:27 +0000)]
Merge "Do not show normal permissions in sideloading UI" into mnc-dev
Svetoslav [Thu, 23 Jul 2015 00:02:46 +0000 (17:02 -0700)]
Do not show normal permissions in sideloading UI
bug:
22627493
Change-Id: I5bb900bb2cd68893c21d9e9b2c973d331d355b58
Dianne Hackborn [Thu, 23 Jul 2015 00:02:10 +0000 (17:02 -0700)]
Fix issue #
22653116: Google App crashing on NYT app
We weren't correctly handling the root view of the window --
we were just pushing it on to the stack, but that means it got
written at the end. Instead, we now immediately write it
after the window and let things follow from there.
Change-Id: I070c96bd2443f312a7c6f495d1bf72fa19c614d6
Fyodor Kupolov [Wed, 22 Jul 2015 23:57:00 +0000 (23:57 +0000)]
Merge "Fixed a typo" into mnc-dev
Adam Lesinski [Wed, 22 Jul 2015 23:41:39 +0000 (23:41 +0000)]
Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
Adrian Roos [Wed, 22 Jul 2015 23:22:42 +0000 (23:22 +0000)]
Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev
Adrian Roos [Wed, 22 Jul 2015 23:10:09 +0000 (23:10 +0000)]
Merge "Protect demo mode commands with permission" into mnc-dev
Adam Lesinski [Wed, 22 Jul 2015 23:01:45 +0000 (16:01 -0700)]
UsageStats: Gracefully handle corrupt filenames
Not sure how useful this is, since renames should be atomic. If the filesystem
is corrupt I'm sure other parts of the system will break. Good to be safe though!
Bug:
22172659
Change-Id: Iad339be2869d170bcf736c59feb93830a51905e1
Fyodor Kupolov [Wed, 22 Jul 2015 22:24:46 +0000 (15:24 -0700)]
Fixed a typo
Change-Id: I85d75429baed3263c04e747eb374c66177c064f5
Jae Seo [Wed, 22 Jul 2015 22:22:32 +0000 (22:22 +0000)]
Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
Svetoslav Ganov [Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)]
Merge "Add a privileged permission to get user accounts" into mnc-dev
John Reck [Wed, 22 Jul 2015 21:29:55 +0000 (21:29 +0000)]
Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
Adam Lesinski [Wed, 22 Jul 2015 21:28:37 +0000 (21:28 +0000)]
Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
Nick Kralevich [Wed, 22 Jul 2015 21:18:59 +0000 (21:18 +0000)]
Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
Chris Wren [Wed, 22 Jul 2015 21:18:40 +0000 (21:18 +0000)]
Merge "Don't crash sysui when advisory calls fail." into mnc-dev
Chris Wren [Wed, 22 Jul 2015 21:03:17 +0000 (17:03 -0400)]
Don't crash sysui when advisory calls fail.
Bug:
22653721
Change-Id: I8e2fc3887b7c71f99eb02306ce308f722dba4d07
John Reck [Wed, 22 Jul 2015 20:55:48 +0000 (13:55 -0700)]
Fix ATLAS_MAP_ENTRY_FIELD_COUNT
Bug:
22558805
Change
a039182d6157bc0487df4ad8e373685c9dd7d662 reduced
the size of an entry from 4 fields to 3, but failed to
update the constant that determined the size of the java long[].
Because the long[] is blindly passed down through to native, this
will result in reading past the end of the array as the size
is no longer a multiple of the number of fields being read so
the loop will not terminate until 1 iteration past the end.
Change-Id: I2f8e26cec9a60b3a74739a3763203296be5f1fd6
Adam Lesinski [Wed, 22 Jul 2015 20:50:23 +0000 (13:50 -0700)]
BatteryStats: Use English locale for dump and checkin data
Dump and checkin data is read by tools that expect a consistent
locale.
Bug:
22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
Fred Chung [Wed, 22 Jul 2015 20:41:41 +0000 (20:41 +0000)]
am
db71828c: am
2c3b9fb8: am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
db71828cb7bff983bd758e986b65731cb0a5b2f6':
Doc change: add note about not exiting on onPause().
Tim Kilbourn [Wed, 22 Jul 2015 20:40:06 +0000 (20:40 +0000)]
Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
Alan Viverette [Wed, 22 Jul 2015 20:35:40 +0000 (20:35 +0000)]
Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
Fyodor Kupolov [Wed, 22 Jul 2015 20:27:06 +0000 (20:27 +0000)]
Merge "Added a note about location permission" into mnc-dev
Dianne Hackborn [Wed, 22 Jul 2015 20:24:30 +0000 (20:24 +0000)]
am
b7394671: Merge "Work on issue #
22303510: Additional permissions aren\'t properly..." into mnc-dev
* commit '
b73946715cb9e3ca7a2702407e34f885e92a5d9a':
Work on issue #
22303510: Additional permissions aren't properly...
Alex Klyubin [Wed, 22 Jul 2015 20:24:21 +0000 (20:24 +0000)]
am
ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
* commit '
ada70be897fb7541129f1ab1f6faa94a80fca986':
Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
Wale Ogunwale [Wed, 22 Jul 2015 20:24:10 +0000 (20:24 +0000)]
am
ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
* commit '
ff21279e2cbe0bdd9c41350b7a204cabf9370377':
Fixed issue with not finding existing activity for background user
Kenny Guy [Wed, 22 Jul 2015 20:24:05 +0000 (20:24 +0000)]
am
2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '
2ba3fec6e0222754d93ed7a491354164d113ad6e':
Support waiting for adb shell am stop-user to complete.
Jason Monk [Wed, 22 Jul 2015 20:24:00 +0000 (20:24 +0000)]
am
41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev
* commit '
41cfd3f8c0df036345807f87b828b4b68bdaffdf':
Fix blank tiles on QS rotate
Jason Monk [Wed, 22 Jul 2015 20:23:55 +0000 (20:23 +0000)]
am
a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev
* commit '
a910a04b8a079a01d684266875eb18c318012de4':
Fix crash in NetworkControllerImpl
Jim Miller [Wed, 22 Jul 2015 20:23:41 +0000 (20:23 +0000)]
am
091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.
* commit '
091f0e5c6c7f9e72a6e661c4849a2e232823075b':
Make FingerprintService more tolerant of fingerprintd crashes.
Svetoslav Ganov [Wed, 22 Jul 2015 20:23:28 +0000 (20:23 +0000)]
am
bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev
* commit '
bdb7d936512a39b6c06411d11a26824b82e5727f':
Update permission icons to final versions - framework
George Mount [Wed, 22 Jul 2015 20:23:02 +0000 (20:23 +0000)]
am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
7c482463cbea39cdbf2c3c8f481d82711cf0475b':
Null checks to prevent NPEs in Fragments transactions.
Jorim Jaggi [Wed, 22 Jul 2015 20:22:56 +0000 (20:22 +0000)]
am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
20df62345910ad390a3bb321990987757db0831d':
Add callback to voice interaction session for lockscreen shown
Nick Kralevich [Wed, 22 Jul 2015 19:59:47 +0000 (12:59 -0700)]
UsbDeviceManager: fix b/
21429947 regression
As discussed in b/
21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.
Always ensure that MTP is the default driver mode.
Get rid of one use of the persistent property. The persistent property
was already pulled from a number of devices, and as explained in
commit
fcf10f7c12cb3107bdfedce6f76a8c866d154f3c, the intent was that
the persistent property would only hold the persistent adb state.
Bug:
22447614
Bug:
21429947
Change-Id: I8b3690a1bafb7cea0d5a69d73c1065c7fc64c653
xin He [Wed, 22 Jul 2015 19:47:53 +0000 (19:47 +0000)]
Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
Jeff Sharkey [Wed, 22 Jul 2015 19:40:44 +0000 (19:40 +0000)]
Merge "More info to support CTS, fix reconcile bug." into mnc-dev
Alan Viverette [Wed, 22 Jul 2015 19:37:14 +0000 (15:37 -0400)]
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
Bug:
22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
Jae Seo [Wed, 22 Jul 2015 07:14:08 +0000 (00:14 -0700)]
TIF: Enable hardware acceleration on overlay
Bug:
18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge changes from topic 'TunerLoc' into mnc-dev
* changes:
Add metrics to tuner
Move tuner enable point to QS
Jorim Jaggi [Wed, 22 Jul 2015 00:24:46 +0000 (17:24 -0700)]
Partially fix that beginning of animation is skipped
When waiting for all the windows that belong to an activity, we
skipped the main window, in case it didn't had a surface yet. This
was a problem because with SurfaceViews: They set it's visibility
extremely early in the app visibility change cycle. Then, they don't
block with the callback to SurfaceHolder.Callback2.surfaceRedrawNeeded,
so window manager thinks it has drawn the first frame already. We don't
even have a surface for the main window yet, but we start the app
transition already because we think the only interesting window for this
app token is the SurfaceView, which has supposedly already drawn.
Bug:
22207948
Change-Id: I2ddb274000fa08866e193f4fd8db3788fc55e0f1
Adrian Roos [Wed, 22 Jul 2015 19:17:43 +0000 (12:17 -0700)]
Fix cut off charging indication in certain scripts
Bug:
22620003
Change-Id: Ib9d8eb4bb0442db86c35374435086e04e71742d7
Dianne Hackborn [Wed, 22 Jul 2015 19:04:00 +0000 (19:04 +0000)]
Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
Adrian Roos [Wed, 22 Jul 2015 19:00:50 +0000 (12:00 -0700)]
resolved conflicts for merge of
c1244a29 to mnc-dr-dev
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
Jason Monk [Thu, 16 Jul 2015 18:15:50 +0000 (14:15 -0400)]
Add metrics to tuner
Bug:
22462605
Change-Id: I075f9a25630a89e85dd17603297565988c38075b