OSDN Git Service
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
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
Adrian Roos [Wed, 22 Jul 2015 23:22:42 +0000 (23:22 +0000)]
Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev
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().
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
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
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().
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 16:09:47 +0000 (16:09 +0000)]
am
c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c41e3191654d1b1e9df641da6aa7a8bf4f64b975':
Import translations. DO NOT MERGE
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 14:03:58 +0000 (14:03 +0000)]
am
920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
920e8be69db7cd24a9c5566b95686a6b714447e9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:03:54 +0000 (14:03 +0000)]
am
e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
e573ee63b7a89b121ad36af883c2731d118f4794':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:03:50 +0000 (14:03 +0000)]
am
b568f3fd: (-s ours) Import translations. DO NOT MERGE
* commit '
b568f3fdc935c9a185b7cf8f462567a6be97b900':
Import translations. DO NOT MERGE
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
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:52:57 +0000 (21:52 +0000)]
am
b020b0d9: am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
b020b0d97d80f0ebb550ce58a5b36787cfcf6df8':
Avoid NPE when no staged installs.
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:19:47 +0000 (21:19 +0000)]
am
9317d0b9: am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
9317d0b9904573bdb0d815ec563dd263447f11db':
Mark isInUse per-window
Fyodor Kupolov [Tue, 21 Jul 2015 21:05:01 +0000 (21:05 +0000)]
am
cf6500b9: am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
cf6500b9bae461107d5c0c58de511df907d19fb3':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
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
Amith Yamasani [Tue, 21 Jul 2015 20:33:07 +0000 (20:33 +0000)]
am
89d4131d: am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
89d4131d75cc4c89e3fb36115be929837c9a3171':
Don't kill apps that are multi-user aware...
Fyodor Kupolov [Tue, 21 Jul 2015 20:32:25 +0000 (20:32 +0000)]
Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 20:18:03 +0000 (20:18 +0000)]
am
a69e72c5: am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
a69e72c54786d2e3a585162b3bd71f325a1a6865':
KM module may consume less input than provided by finish time.
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.
Adam Lesinski [Tue, 21 Jul 2015 19:54:24 +0000 (19:54 +0000)]
am
a50f43e0: am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
a50f43e0028ec174827e73d1e45666b8e694808f':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
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
Christopher Tate [Tue, 21 Jul 2015 19:41:19 +0000 (19:41 +0000)]
am
6391a8d4: am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
6391a8d44684f64d9b803f7994f26935a563a1ee':
Add 'pm' operation to set a package's app-linking state
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
Svetoslav [Tue, 21 Jul 2015 19:30:37 +0000 (19:30 +0000)]
am
358af143: am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
358af143454fdcda120e90840b6ca835bebc4120':
Always create nodes for views backed by an adapter.
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
Adam Lesinski [Tue, 21 Jul 2015 19:08:56 +0000 (12:08 -0700)]
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.
The original regression was introduced here: ag/659258
Bug:
22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
Fyodor Kupolov [Tue, 21 Jul 2015 18:48:18 +0000 (11:48 -0700)]
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Bug:
21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
Svetoslav [Tue, 21 Jul 2015 19:01:05 +0000 (19:01 +0000)]
Merge "Always create nodes for views backed by an adapter." into mnc-dev
Svet Ganov [Tue, 21 Jul 2015 18:52:21 +0000 (11:52 -0700)]
Update permission icons to final versions - framework
bug:
22383613
Change-Id: I3f524fd0538a1b843b0394fa766f032835d1ecaa
Amith Yamasani [Tue, 21 Jul 2015 18:46:14 +0000 (11:46 -0700)]
Don't kill apps that are multi-user aware...
... when looking for background user apps that hold RECORD_AUDIO
permission.
On switching users, we kill any apps that might potentially be
recording audio. But we don't want to kill critical apps that need
to stay running because of multi-user aware services.
Bug:
22564430
Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
Todd Kennedy [Tue, 21 Jul 2015 18:37:15 +0000 (18:37 +0000)]
am
548871f2: am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
548871f202c2c68e0197cc993073ca80a60f70da':
Use RingtonePlayer to get ringtone title
Todd Kennedy [Tue, 21 Jul 2015 18:21:33 +0000 (18:21 +0000)]
am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
Use RingtonePlayer to get ringtone title
Todd Kennedy [Tue, 21 Jul 2015 18:11:16 +0000 (18:11 +0000)]
Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
John Reck [Tue, 21 Jul 2015 17:23:59 +0000 (10:23 -0700)]
Mark isInUse per-window
Bug:
22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
Nick Kralevich [Tue, 21 Jul 2015 17:38:50 +0000 (17:38 +0000)]
am
894ffd10: am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
894ffd102d90a7c794e5c522818f163b92baa55d':
UsbDeviceManager: add back support for USB overlays
Nick Kralevich [Tue, 21 Jul 2015 17:25:30 +0000 (17:25 +0000)]
am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
673ccfd45a81482d97eecf76dc0fef0dfd57be73':
UsbDeviceManager: add back support for USB overlays
Kenny Guy [Mon, 20 Jul 2015 15:56:28 +0000 (16:56 +0100)]
Support waiting for adb shell am stop-user to complete.
Use stop user callback to wait for AM.stopUser to complete
if -w flag is passed to adb shell am stop-user
bug:
22599411
Change-Id: I8adbfdbb1ba69a88a67431da65f0a85035587c2d