OSDN Git Service
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
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
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
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
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
Jason Monk [Thu, 16 Jul 2015 12:58:15 +0000 (08:58 -0400)]
Move tuner enable point to QS
Long clicking on settings gear in QS causes it to accelarate and
spin, when released it will open and enable the tuner. On first
opening there will be a warning dialog.
Also add way to disable tuner from tuner screen. This way it can
be removed from its former home in Developer Settings. All tuner
settings are reset when disabled to match developer settings
behavior.
Bug:
22462605
Change-Id: Ie700a6a15e6c3caccf7cd1885da73328e6fac6ab
Jeff Sharkey [Wed, 22 Jul 2015 18:11:46 +0000 (11:11 -0700)]
More info to support CTS, fix reconcile bug.
Surface more details and commands for storage volumes to support
CTS testing. Fix user reconciliation bug that skipped user setup on
empty volumes.
Bug:
22658804,
22633097
Change-Id: I4221312d1cce24d1f5a2c108095cf3cf471598ed
Fred Chung [Wed, 22 Jul 2015 17:46:21 +0000 (17:46 +0000)]
am
2c3b9fb8: am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
2c3b9fb86b9fb26b01fe5af2067f6513bf06acf3':
Doc change: add note about not exiting on onPause().
wang.zhenyu [Sat, 4 Jul 2015 09:00:16 +0000 (17:00 +0800)]
Miss USB device Interface from UsbManager.getDeviceList().
In the scenario that you connect more than one device to android phone
with an usb hub, when you attach the second device,mNewConfigurationis
is still corresponded to the first device unless another
mNewConfiguration is created by a new operation. However,before another
mNewConfiguration is created,setInterfaces() in addUsbConfiguration()
has already been executed. Problem is that mNewInterfaces has already
been cleared when it finished endUsbDeviceAdded for the first device. As
a result,the UsbInterface descriptor in the first device's Configuration
descriptor is set to null.
Bug:
22657587
Change-Id: I0ba4f07c809d07ebebed633e43c3ee8e2e4c5060
Dianne Hackborn [Wed, 22 Jul 2015 16:14:59 +0000 (16:14 +0000)]
Merge "Work on issue #
22303510: Additional permissions aren't properly..." into mnc-dev
Geoff Mendal [Wed, 22 Jul 2015 15:56:29 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 15:42:52 +0000 (10:42 -0500)]
Import translations. DO NOT MERGE
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
Alex Klyubin [Wed, 22 Jul 2015 15:24:27 +0000 (15:24 +0000)]
Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
Wale Ogunwale [Wed, 22 Jul 2015 14:21:31 +0000 (14:21 +0000)]
Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
Geoff Mendal [Wed, 22 Jul 2015 13:58:09 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 13:53:49 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 13:51:43 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 13:50:26 +0000 (06:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I064668ffb91d718c0981ecd0f221e5f3b0d364d7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 13:49:42 +0000 (06:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
Kenny Guy [Wed, 22 Jul 2015 13:49:20 +0000 (13:49 +0000)]
Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
Jason Monk [Wed, 22 Jul 2015 12:56:40 +0000 (12:56 +0000)]
Merge "Fix blank tiles on QS rotate" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 12:54:20 +0000 (12:54 +0000)]
Merge "Fix crash in NetworkControllerImpl" into mnc-dev
Jim Miller [Tue, 21 Jul 2015 23:58:46 +0000 (16:58 -0700)]
Make FingerprintService more tolerant of fingerprintd crashes.
- attempt to restart fingerprintd on the next request
- inform clients that the hardware isn't available and cancel
listeners.
Fixes bug
22492148
Change-Id: Ib27eaf7f197c6a4e6ed9b085602882904d6b794d
Svet Ganov [Wed, 22 Jul 2015 02:23:17 +0000 (19:23 -0700)]
Add a privileged permission to get user accounts
bug:
22602794
Change-Id: I6e5429f0eb5f2cb274d4740755070e588735e179
Dianne Hackborn [Wed, 22 Jul 2015 00:39:46 +0000 (17:39 -0700)]
Fix issue #
22612630: Ensure SMS/Call delivery during Doze
Add whitelist timeout for SMS.
Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
Svetoslav Ganov [Wed, 22 Jul 2015 00:06:10 +0000 (00:06 +0000)]
Merge "Update permission icons to final versions - framework" into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 23:54:54 +0000 (16:54 -0700)]
Fixed issue with not finding existing activity for background user
We currently go through the list of existing activities to find
a match for the launching intent so we can re-use the activity
record if one already exist. However, we exit the search early
once we run across an activity record that doesn't belong to the
current foreground user. This will cause us to create duplicate
activity records if the launching intent is for a backround
user and an activity record already exist.
Based on https://android-review.googlesource.com/#/c/159131
Bug:
22564256
Change-Id: I4b6d94059c11fd2e621e65c8ec2c99427c15b246
Dianne Hackborn [Tue, 21 Jul 2015 23:57:51 +0000 (16:57 -0700)]
Work on issue #
22303510: Additional permissions aren't properly...
...disabled after toggling them off
Keep track of whether a permission that has been declared by an app
was able to actually be installed in the system, along with an API
to find this information so that system UI can tell whether that
permission is of interest.
Also clean up some of the permission debug output.
Change-Id: If4541bedb857789b255bb18f03cad155dcda0b95
Adrian Roos [Tue, 21 Jul 2015 23:20:36 +0000 (16:20 -0700)]
Send BATTERY_CHANGED if maxChargingCurrent changes
Fixes a bug where the charging current on Keyguard was stale
on devices that don't immediately set the charging current.
Follow-up to I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
Bug:
8099739
Change-Id: I4b5b3b1231b1372310206941386dba743d5f88f4
George Mount [Tue, 21 Jul 2015 22:51:27 +0000 (22:51 +0000)]
Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
Jorim Jaggi [Tue, 21 Jul 2015 22:46:30 +0000 (22:46 +0000)]
Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
Fred Chung [Tue, 21 Jul 2015 22:16:55 +0000 (22:16 +0000)]
am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
3ccbf3bad50c47409de9570c422756f9e3fa518a':
Doc change: add note about not exiting on onPause().
Fred Chung [Tue, 21 Jul 2015 22:06:13 +0000 (22:06 +0000)]
Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
Jorim Jaggi [Tue, 21 Jul 2015 21:53:09 +0000 (21:53 +0000)]
Merge "Touch, wake and unlock" into mnc-dev
Jeff Sharkey [Tue, 21 Jul 2015 21:36:56 +0000 (21:36 +0000)]
am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
cf051d1846c347413d8c907b42f3fce74795a815':
Avoid NPE when no staged installs.
George Mount [Tue, 21 Jul 2015 21:30:24 +0000 (14:30 -0700)]
Null checks to prevent NPEs in Fragments transactions.
Bug
22631964
Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
Jeff Sharkey [Tue, 21 Jul 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Avoid NPE when no staged installs." into mnc-dev
John Reck [Tue, 21 Jul 2015 21:04:45 +0000 (21:04 +0000)]
am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
Mark isInUse per-window
John Reck [Tue, 21 Jul 2015 20:50:27 +0000 (20:50 +0000)]
Merge "Mark isInUse per-window" into mnc-dev
Fyodor Kupolov [Tue, 21 Jul 2015 20:50:24 +0000 (20:50 +0000)]
am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Fyodor Kupolov [Tue, 21 Jul 2015 20:32:25 +0000 (20:32 +0000)]
Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
Amith Yamasani [Tue, 21 Jul 2015 20:18:02 +0000 (20:18 +0000)]
am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
09ba71513ba3bb092eb3effbe45953c50430ff20':
Don't kill apps that are multi-user aware...
Amith Yamasani [Tue, 21 Jul 2015 20:04:19 +0000 (20:04 +0000)]
Merge "Don't kill apps that are multi-user aware..." into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 20:02:21 +0000 (20:02 +0000)]
am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
5d586dd585a6663290b68abce433a75b5760fc5d':
KM module may consume less input than provided by finish time.
Alex Klyubin [Tue, 21 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "KM module may consume less input than provided by finish time." into mnc-dev
Adam Lesinski [Tue, 21 Jul 2015 19:40:24 +0000 (19:40 +0000)]
am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
23e19066de2caf1db1fa0759ac49a1118b59f7a5':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Jorim Jaggi [Mon, 20 Jul 2015 22:51:40 +0000 (15:51 -0700)]
Add callback to voice interaction session for lockscreen shown
Bug:
22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
Christopher Tate [Tue, 21 Jul 2015 19:28:04 +0000 (19:28 +0000)]
am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
d9c2ff99bf9469f155eabf341880d055741e9db5':
Add 'pm' operation to set a package's app-linking state
Adam Lesinski [Tue, 21 Jul 2015 19:26:43 +0000 (19:26 +0000)]
Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
Svetoslav [Tue, 21 Jul 2015 19:12:13 +0000 (19:12 +0000)]
am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
81adda25b396ee3db794bc9a7946b579d01c2aa0':
Always create nodes for views backed by an adapter.
Christopher Tate [Tue, 21 Jul 2015 19:11:34 +0000 (19:11 +0000)]
Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev