OSDN Git Service
Svetoslav Ganov [Mon, 27 Jul 2015 19:41:20 +0000 (19:41 +0000)]
am
8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '
8a54da92ce3da393396bbf0ff86d9525089dcdbf':
Pass correct extras to the custom print options activity
Svetoslav Ganov [Mon, 27 Jul 2015 19:23:37 +0000 (19:23 +0000)]
Merge "Pass correct extras to the custom print options activity" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 19:22:02 +0000 (19:22 +0000)]
am
9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '
9e49b5d679672ea4a64382f9a36663c73603961b':
Move PIN/Pattern appear animation to RenderThread (1/2)
Jorim Jaggi [Mon, 27 Jul 2015 18:55:29 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
George Mount [Mon, 27 Jul 2015 18:42:39 +0000 (18:42 +0000)]
am
01fe3f86: am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit '
01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d':
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
George Mount [Mon, 27 Jul 2015 18:24:40 +0000 (18:24 +0000)]
am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit '
1c964bece6ce1bbbf9f641d95df3bf2de01f6ab7':
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
Fyodor Kupolov [Mon, 27 Jul 2015 17:57:19 +0000 (17:57 +0000)]
am
b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
* commit '
b83b5fa641847ee1d533253ba5e1a3e13913b9d9':
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
Chris Craik [Mon, 27 Jul 2015 17:57:12 +0000 (17:57 +0000)]
am
4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
* commit '
4604c1dc67f634e1fac37f623f5b093615d49f0f':
Fix bitmap get/set pixels for ALPHA_8
Phil Burk [Mon, 27 Jul 2015 17:57:01 +0000 (17:57 +0000)]
am
fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit '
fef1b28917df9a23b28ec5e5e7f83097b8574550':
MIDI: fix running status parser
George Mount [Mon, 27 Jul 2015 17:38:22 +0000 (10:38 -0700)]
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
This reverts commit
c571a9a1d026cbf262cf36a5348f99d1ca0ec835, reversing
changes made to
a29cfefe2c157a28b256771b1dce4653d405dcf1.
This should fix the build break for LMP downstream branches.
Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17
Fyodor Kupolov [Mon, 27 Jul 2015 17:27:02 +0000 (17:27 +0000)]
Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
Chris Craik [Mon, 27 Jul 2015 17:23:52 +0000 (17:23 +0000)]
Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
Phil Burk [Mon, 27 Jul 2015 17:15:04 +0000 (17:15 +0000)]
Merge "MIDI: fix running status parser" into mnc-dev
Tim Volodine [Mon, 27 Jul 2015 16:57:05 +0000 (16:57 +0000)]
am
91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
* commit '
91b31b53127aafbf3ed34b98f405d6e750627050':
Revert "Invoke geolocation permissions callback with denied state by default."
Tim Volodine [Mon, 27 Jul 2015 16:37:57 +0000 (16:37 +0000)]
Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
Tim Volodine [Thu, 23 Jul 2015 17:16:16 +0000 (17:16 +0000)]
Revert "Invoke geolocation permissions callback with denied state by default."
This reverts commit
954d1333c478d4dba6c9a0536510da4fd94c0622.
The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/
22685046
Bug:
22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit
0bb7d2e46710932d09688a18d4c5836f9b1413a5)
George Mount [Mon, 27 Jul 2015 15:03:28 +0000 (15:03 +0000)]
am
9c450936: am
c571a9a1: am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
9c450936aad92920215d2bc52d2c9ce132a55432':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 15:03:23 +0000 (15:03 +0000)]
am
c0231f26: (-s ours) am
a29cfefe: (-s ours) am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
c0231f26fe9ba13c3facb6caf42e53bae261654c':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:49:16 +0000 (14:49 +0000)]
am
c571a9a1: am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 14:49:11 +0000 (14:49 +0000)]
am
a29cfefe: (-s ours) am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
a29cfefe2c157a28b256771b1dce4653d405dcf1':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:35:50 +0000 (14:35 +0000)]
am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 14:35:45 +0000 (14:35 +0000)]
am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
95e6ae3ad1ba8647494f0b5007b7beee76493e03':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:24:34 +0000 (14:24 +0000)]
Merge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:24:17 +0000 (14:24 +0000)]
Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
Chris Wren [Mon, 27 Jul 2015 13:22:37 +0000 (13:22 +0000)]
am
11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '
11f4cb1bccf47a0e985be6948f30709ba40f4522':
decide interruptions based on current data, not previous data.
Chris Wren [Mon, 27 Jul 2015 13:22:29 +0000 (13:22 +0000)]
am
45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '
45a0bb18fec5b137a540e160cecd4ffd091098d9':
add ticker to enqueue message for easier debugging
Chris Wren [Mon, 27 Jul 2015 13:10:11 +0000 (13:10 +0000)]
Merge "decide interruptions based on current data, not previous data." into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:09:15 +0000 (13:09 +0000)]
Merge "add ticker to enqueue message for easier debugging" into mnc-dev
Erik Kline [Mon, 27 Jul 2015 04:59:19 +0000 (04:59 +0000)]
am
a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '
a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
Change to connectivitycheck.gstatic.com
Erik Kline [Mon, 27 Jul 2015 02:35:09 +0000 (02:35 +0000)]
Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
Nick Kralevich [Sun, 26 Jul 2015 06:16:02 +0000 (06:16 +0000)]
am
73612fbb: am
e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
* commit '
73612fbbc99af331f0345479231538b5f0f2452e':
ActivityManagerService: delete unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:39:19 +0000 (04:39 +0000)]
am
e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
* commit '
e942b4596a12685cb722ddef4e59e279e6fd513f':
ActivityManagerService: delete unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:25:56 +0000 (04:25 +0000)]
Merge "ActivityManagerService: delete unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:12:09 +0000 (21:12 -0700)]
ActivityManagerService: delete unnecessary mkdir
/data/anr is now created in init.rc. This code is unnecessary.
Bug:
22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d
Svet Ganov [Sat, 25 Jul 2015 19:10:54 +0000 (12:10 -0700)]
Pass correct extras to the custom print options activity
bug:
22734138
Change-Id: Iea1bc32c3e863072b2021b823bef2cefa54fa540
Jeff Sharkey [Sat, 25 Jul 2015 02:21:47 +0000 (02:21 +0000)]
am
8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
* commit '
8be305dd6582f154c5a5894034a35fc8ec225b71':
Also check app-ops on path-permissions.
Jeff Sharkey [Sat, 25 Jul 2015 02:05:56 +0000 (02:05 +0000)]
Merge "Also check app-ops on path-permissions." into mnc-dev
Selim Cinek [Sat, 25 Jul 2015 01:54:54 +0000 (01:54 +0000)]
am
d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
* commit '
d9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091':
Fixed wake to unlock when the device has never been unlocked
Jorim Jaggi [Sat, 25 Jul 2015 01:54:47 +0000 (01:54 +0000)]
am
f3255489: Fix ambient display
* commit '
f325548992d449a2da564216191edb5ad2773bfd':
Fix ambient display
Selim Cinek [Sat, 25 Jul 2015 01:48:16 +0000 (01:48 +0000)]
Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
Jorim Jaggi [Fri, 24 Jul 2015 19:32:42 +0000 (12:32 -0700)]
Fix ambient display
Due to a refactoring for touch, wake and unlock for fingerprint
devices PhoneWindowManager now waits for Keyguard to draw its first
frame in all cases, including when screen turns on for pulsing.
However, since in this case the device is not awake, we need to check
for screen on instead of awakeness when proceeding with the wake-up
sequence. Without this change, screen on was blocked forever in the
pulsing case.
Bug:
22605235
Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7
Adam Lesinski [Sat, 25 Jul 2015 01:29:26 +0000 (01:29 +0000)]
am
2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
* commit '
2a493532e6ce44fd6dec07a22c3a016de80ccc46':
BatteryStats: Decode wakeup reasons in Java
Selim Cinek [Sat, 25 Jul 2015 01:15:43 +0000 (18:15 -0700)]
Fixed wake to unlock when the device has never been unlocked
Previously the fingerprint could still unlock the device
when waking up with the fingerprint sensor, since we were not
checking if it is allowed.
Bug:
22622999
Change-Id: I039a4e0701c1f161f227cf6f1d25e8147548db47
Adam Lesinski [Sat, 25 Jul 2015 01:14:07 +0000 (01:14 +0000)]
Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
Selim Cinek [Sat, 25 Jul 2015 00:45:55 +0000 (00:45 +0000)]
am
f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit '
f8acd1d8d698f367bc267699a0a84c21f7c7d548':
Adapted the behavior when unlocking with fingerprint is not allowed
Selim Cinek [Sat, 25 Jul 2015 00:33:14 +0000 (00:33 +0000)]
Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
Fyodor Kupolov [Fri, 24 Jul 2015 01:38:10 +0000 (18:38 -0700)]
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
Call to checkPermission(ACCESS_COARSE_LOCATION) should return
PERMISSION_GRANTED, when package only has ACCESS_FINE_LOCATION permission
Bug:
21852542
Change-Id: I53fe2945784213693f59e7bfccc524276ea8c189
Andreas Gampe [Fri, 24 Jul 2015 23:08:49 +0000 (23:08 +0000)]
am
ac2c632f: am
c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"
* commit '
ac2c632ff163e25adbc00ddc26e145c7ad5dd7a6':
Frameworks/base: Hand fingerprint to ART
Chris Banes [Fri, 24 Jul 2015 23:02:13 +0000 (23:02 +0000)]
am
c174de0a: am
5442932a: am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
c174de0ab353e2ecaf6e1728e6899bffcfefe48e':
v22.2.1 support api diff
Adrian Roos [Fri, 24 Jul 2015 23:02:05 +0000 (23:02 +0000)]
am
384b5d20: am
a65de4fd: am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
384b5d20b64c279f29eb494bae37d039c652f492':
Prevent insanely long passwords from crashing SystemUI
Andreas Gampe [Fri, 24 Jul 2015 22:51:49 +0000 (22:51 +0000)]
am
c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"
* commit '
c0999f7877616826f7c371fb49b081b82ad9b067':
Frameworks/base: Hand fingerprint to ART
Chris Banes [Fri, 24 Jul 2015 22:41:35 +0000 (22:41 +0000)]
am
5442932a: am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
5442932a4befd66394fb155ae95a2eaadd2001a9':
v22.2.1 support api diff
Adrian Roos [Fri, 24 Jul 2015 22:41:26 +0000 (22:41 +0000)]
am
a65de4fd: am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
a65de4fde99c84ae7c7cab242e8e1e46ee6c0a5d':
Prevent insanely long passwords from crashing SystemUI
Andreas Gampe [Fri, 24 Jul 2015 22:38:28 +0000 (22:38 +0000)]
Merge "Frameworks/base: Hand fingerprint to ART"
Andreas Gampe [Fri, 24 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.
Bug:
22693991
(cherry picked from commit
e60825033fdde9eefaeec768a28b907e2d22f10c)
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Chris Craik [Fri, 24 Jul 2015 22:17:29 +0000 (15:17 -0700)]
Fix bitmap get/set pixels for ALPHA_8
bug:
22724734
Change-Id: If8307854f6bad6fac9ee0b394bf0b044c61183e5
John Reck [Fri, 24 Jul 2015 22:25:37 +0000 (22:25 +0000)]
am
68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
* commit '
68fbd6a4968eb6e5f3d74f471387c5e62981fba2':
Use process state to filter >= UI_HIDDEN
Jeff Sharkey [Fri, 24 Jul 2015 22:10:20 +0000 (15:10 -0700)]
Also check app-ops on path-permissions.
Any place that we check permissions we also need to check any
app-ops associated with those permissions. In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.
Bug:
22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
John Reck [Fri, 24 Jul 2015 22:15:47 +0000 (22:15 +0000)]
Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
Adrian Roos [Fri, 24 Jul 2015 21:54:44 +0000 (21:54 +0000)]
am
4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
* commit '
4629f1c58c00480b0dbd5a541a26b703b0770bf4':
Fix janky add guest transition
Adrian Roos [Fri, 24 Jul 2015 21:42:46 +0000 (21:42 +0000)]
Merge "Fix janky add guest transition" into mnc-dev
Andreas Gampe [Fri, 24 Jul 2015 21:37:40 +0000 (21:37 +0000)]
am
9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
* commit '
9a755e3650270439861f5ac1e0c51caa7c4a7d3d':
Frameworks/base: Hand fingerprint to ART
Andreas Gampe [Fri, 24 Jul 2015 21:25:09 +0000 (21:25 +0000)]
Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
Andreas Gampe [Fri, 24 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.
Bug:
22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Phil Burk [Thu, 23 Jul 2015 23:46:53 +0000 (16:46 -0700)]
MIDI: fix running status parser
Running status was being parsed incorrectly.
This could cause stuck notes or exceptions when sending running
status messages to a Bluetooth MIDI device.
Bug:
22689606
Change-Id: I9f7abce9758927be587eead9614617d5b0076353
Signed-off-by: Phil Burk <philburk@google.com>
Chris Banes [Fri, 24 Jul 2015 20:19:09 +0000 (20:19 +0000)]
am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
7b099152b6bd5844c30464a7c08dde2e22124491':
v22.2.1 support api diff
Robert Greenwalt [Fri, 24 Jul 2015 20:06:24 +0000 (20:06 +0000)]
am
f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
* commit '
f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
DO NOT MERGE Enhance local log.
Adam Lesinski [Fri, 24 Jul 2015 01:13:38 +0000 (18:13 -0700)]
BatteryStats: Decode wakeup reasons in Java
Wakeup reasons come from drivers and sometimes are malformed UTF-8.
Decode them in Java so we can easily replace malformed characters
and still have user visible strings.
Bug:
22368519
Change-Id: Ifade1a7fcdf6545e7e344d74390200c329430e14
Robert Greenwalt [Fri, 24 Jul 2015 19:54:07 +0000 (19:54 +0000)]
Merge "DO NOT MERGE Enhance local log." into mnc-dev
Adrian Roos [Fri, 24 Jul 2015 19:45:24 +0000 (19:45 +0000)]
am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
b2f8c716e8d2cf575c690b5a360c4efdd9f06bc8':
Prevent insanely long passwords from crashing SystemUI
Robert Greenwalt [Fri, 24 Jul 2015 19:44:03 +0000 (12:44 -0700)]
DO NOT MERGE Enhance local log.
to be reverted with ag/733658
bug:
22632129
Change-Id: Id3899ee8e987ccc469394dd4d0c41465c48dc37e
Amith Yamasani [Fri, 24 Jul 2015 19:23:45 +0000 (19:23 +0000)]
am
2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
* commit '
2c5aeeaaaaa0e048817dd04d41ae9f396bb76fb6':
Require permission for internal broadcast
Amith Yamasani [Fri, 24 Jul 2015 19:12:16 +0000 (19:12 +0000)]
Merge "Require permission for internal broadcast" into mnc-dev
Fyodor Kupolov [Fri, 24 Jul 2015 18:03:15 +0000 (18:03 +0000)]
am
a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
* commit '
a5e25f33a530eb76c7b0fb77111eeedd6bd1f879':
Added ACCESS_COARSE_LOCATION permission for BT
Fyodor Kupolov [Fri, 24 Jul 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
Andrei Stingaceanu [Fri, 24 Jul 2015 14:47:50 +0000 (14:47 +0000)]
am
45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
* commit '
45794910031ce2a0e2df3d1694783da7e3c4352b':
Disallow dragging text in extracted mode
Julia Reynolds [Fri, 24 Jul 2015 14:47:39 +0000 (14:47 +0000)]
am
ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
* commit '
ea00f320ee9caad53d63a3eaaee2d4733c9dca50':
Prevent lockscreen album art from flickering on metadata change.
Andrei Stingaceanu [Fri, 24 Jul 2015 14:35:48 +0000 (14:35 +0000)]
Merge "Disallow dragging text in extracted mode" into mnc-dev
Julia Reynolds [Fri, 24 Jul 2015 14:34:02 +0000 (14:34 +0000)]
Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
Jim Miller [Fri, 24 Jul 2015 02:50:12 +0000 (02:50 +0000)]
am
abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
abd35bfc81ae231656c6fba67d43cfbb76f3db0d':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Jim Miller [Fri, 24 Jul 2015 02:41:00 +0000 (02:41 +0000)]
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
John Reck [Fri, 24 Jul 2015 01:27:09 +0000 (18:27 -0700)]
Use process state to filter >= UI_HIDDEN
Bug:
22701182
Change-Id: Ia192016397c8115a19a0dca409aa70dea154c41e
Ying Wang [Fri, 24 Jul 2015 01:11:22 +0000 (01:11 +0000)]
am
802da28f: am
430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
* commit '
802da28f22f2869c810531b95ac90f7fa446df93':
Add phony source target in the generated dependency file of aidl.
Jean-Michel Trivi [Fri, 24 Jul 2015 01:02:48 +0000 (01:02 +0000)]
am
7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit '
7b9968538b122225bb321de9995a8f55d3de4455':
MediaPlayer subtitle controller: use debug log instead of warning
John Reck [Fri, 24 Jul 2015 01:02:41 +0000 (01:02 +0000)]
am
6b66a4a8: use findProcess instead of getProcess
* commit '
6b66a4a8a342b8156f73d83771caa1db2f866529':
use findProcess instead of getProcess
Amith Yamasani [Fri, 24 Jul 2015 00:15:45 +0000 (17:15 -0700)]
Require permission for internal broadcast
It was possible for other apps to request removal of the guest user
that was handled by an internal receiver in SystemUI.
Fix requires the broadcast sender to have an internal permission
so that only SystemUI can send that broadcast (PendingIntent).
Bug:
22671268
Change-Id: I63a8ced692e6d1cb2872b962ad247a827dbafbc6
Ying Wang [Fri, 24 Jul 2015 00:54:53 +0000 (00:54 +0000)]
am
430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
* commit '
430c8c3e48b361f75d29d05b8fda3aac22ceb1f9':
Add phony source target in the generated dependency file of aidl.
Jean-Michel Trivi [Fri, 24 Jul 2015 00:46:15 +0000 (00:46 +0000)]
Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
Ying Wang [Fri, 24 Jul 2015 00:38:08 +0000 (00:38 +0000)]
Merge "Add phony source target in the generated dependency file of aidl."
John Reck [Fri, 24 Jul 2015 00:36:13 +0000 (17:36 -0700)]
use findProcess instead of getProcess
Bug:
22701182
Change-Id: I2ec56c55c49401f2f213bbd318e867fd73b37672
Amit Mahajan [Fri, 24 Jul 2015 00:12:16 +0000 (00:12 +0000)]
am
eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit '
eea9892d9ec24a5a9c4911efec8fe28e3d1af968':
UICC : discard language setting of SIM
Adrian Roos [Fri, 24 Jul 2015 00:02:22 +0000 (00:02 +0000)]
am
0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '
0063e0bcd55d1ed3b6c37c6616c0c858e0784a07':
Disable Keyguard affordances before setup is completed
Svetoslav Ganov [Fri, 24 Jul 2015 00:02:14 +0000 (00:02 +0000)]
am
28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
* commit '
28762e61e2e45a7e30af02c6fa840a065a645b68':
Keep default permission grants uninstalling a sys package upgrade
John Reck [Fri, 24 Jul 2015 00:02:08 +0000 (00:02 +0000)]
am
8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '
8b1154c487c25388107dc024376435f3b0ae2385':
Move updateMatrix() call to animateCommon
Deepanshu Gupta [Fri, 24 Jul 2015 00:01:59 +0000 (00:01 +0000)]
am
f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '
f199ac84f39ee92f314f5c8740b13a21a14fada9':
Set support flag for custom layouts for RecyclerView.
Amit Mahajan [Thu, 23 Jul 2015 23:59:40 +0000 (23:59 +0000)]
Merge "UICC : discard language setting of SIM" into mnc-dev
Adrian Roos [Thu, 23 Jul 2015 23:56:37 +0000 (23:56 +0000)]
Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
Svetoslav Ganov [Thu, 23 Jul 2015 23:56:31 +0000 (23:56 +0000)]
Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
John Reck [Thu, 23 Jul 2015 23:48:40 +0000 (23:48 +0000)]
Merge "Move updateMatrix() call to animateCommon" into mnc-dev
Svet Ganov [Thu, 23 Jul 2015 23:44:05 +0000 (16:44 -0700)]
Keep default permission grants uninstalling a sys package upgrade
bug:
22665508
Change-Id: I1cb1e53a8643ddad77f0be9e40d5b504501e06de