OSDN Git Service
Dianne Hackborn [Wed, 29 Jul 2015 01:00:37 +0000 (01:00 +0000)]
am
b492ced8: Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit '
b492ced89eaf38b2b9962dbfae2435dd242abf19':
Fix issue #
22802782: APR: NPE in package manager with bad intent data
Dianne Hackborn [Wed, 29 Jul 2015 00:45:18 +0000 (00:45 +0000)]
Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:41:03 +0000 (00:41 +0000)]
am
c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '
c96e6f19937ac36c8147a52863a43b35895aeb0b':
BatteryStats: Use proper power calculator when energy data is received
Jason Monk [Wed, 29 Jul 2015 00:40:58 +0000 (00:40 +0000)]
am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 00:40:53 +0000 (00:40 +0000)]
am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
15938235d25a879ebb000cb3671fd75cb092e981':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Adam Lesinski [Wed, 29 Jul 2015 00:34:38 +0000 (00:34 +0000)]
Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
Jason Monk [Wed, 29 Jul 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Add sizes to SysUI tests" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:30:59 +0000 (17:30 -0700)]
Fix issue #
22802782: APR: NPE in package manager with bad intent data
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.
Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
Aravind Akella [Wed, 29 Jul 2015 00:21:18 +0000 (00:21 +0000)]
Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:11:29 +0000 (17:11 -0700)]
BatteryStats: Use proper power calculator when energy data is received
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.
We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.
Bug:
22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
Jorim Jaggi [Tue, 28 Jul 2015 23:19:39 +0000 (23:19 +0000)]
am
0d210f63: Animation for touch, wake and unlock
* commit '
0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
Animation for touch, wake and unlock
Chris Tate [Tue, 28 Jul 2015 23:19:34 +0000 (23:19 +0000)]
am
751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev
* commit '
751a96a040ada09199ca3356d9a515ec090d1237':
Don't redundantly call transport.finishRestore()
Jorim Jaggi [Fri, 10 Jul 2015 21:24:44 +0000 (14:24 -0700)]
Animation for touch, wake and unlock
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
First, start with a black scrim on top of everything, and then fade
it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
in the same manner as the scrim.
Bug:
22571198
Bug:
21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
Zach Johnson [Tue, 28 Jul 2015 22:58:11 +0000 (22:58 +0000)]
am
5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit '
5faa033615dcb4297fcb6a81828099285364942d':
Add filter for personal apps that are not disabled until first use
Chris Tate [Tue, 28 Jul 2015 22:56:41 +0000 (22:56 +0000)]
Merge "Don't redundantly call transport.finishRestore()" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:37:28 +0000 (22:37 +0000)]
am
f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit '
f2c616ed02aee3b9a9025caf288aadbf22cfd046':
Partially revert package freezing
Zach Johnson [Tue, 28 Jul 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:15:43 +0000 (22:15 +0000)]
Merge "Partially revert package freezing" into mnc-dev
Christopher Tate [Tue, 28 Jul 2015 20:59:35 +0000 (13:59 -0700)]
Don't redundantly call transport.finishRestore()
The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.
Bug
22640096
Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
Todd Kennedy [Tue, 28 Jul 2015 20:52:49 +0000 (13:52 -0700)]
Partially revert package freezing
On the Nexus Player, upgrading the launcher would cause multiple, simultaneous
processes to be running. In order to prevent this regression, revert the portion
of ag/682591 dealing with package upgrades.
Bug:
21123444
Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039
Tyler Gunn [Tue, 28 Jul 2015 20:31:05 +0000 (20:31 +0000)]
am
bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '
bdbec480e8598bd959a2fc047cfad8b72c8a645b':
Add "Call subject" capability to phone accounts.
Tyler Gunn [Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Add "Call subject" capability to phone accounts." into mnc-dev
Dianne Hackborn [Tue, 28 Jul 2015 19:57:40 +0000 (19:57 +0000)]
am
3551a59b: Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '
3551a59b277fd4dc924f48116c153a50fb0913eb':
Work on issue #
21516866: Implement voice interaction in ResolverActivity
Jorim Jaggi [Tue, 28 Jul 2015 19:57:35 +0000 (19:57 +0000)]
am
850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev
* commit '
850dd6907f87782474d4bc128c8c0137a9cc85fc':
Don't use screenshot if structure is disabled (1/2)
Robert Greenwalt [Tue, 28 Jul 2015 19:57:31 +0000 (19:57 +0000)]
am
b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '
b3c93c5f4256a1da1a8020abe5812a841b67667a':
Un-remove legacy ConnectivityManager API.
Dianne Hackborn [Tue, 28 Jul 2015 19:52:53 +0000 (19:52 +0000)]
Merge "Work on issue #
21516866: Implement voice interaction in ResolverActivity" into mnc-dev
Dianne Hackborn [Tue, 28 Jul 2015 01:11:14 +0000 (18:11 -0700)]
Work on issue #
21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.
This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.
Also added some debug help, having activity print the state of the
voice interactor.
Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
Jorim Jaggi [Tue, 28 Jul 2015 19:49:44 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev
Robert Greenwalt [Tue, 28 Jul 2015 19:39:48 +0000 (19:39 +0000)]
Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
Robert Greenwalt [Tue, 28 Jul 2015 18:41:31 +0000 (11:41 -0700)]
Un-remove legacy ConnectivityManager API.
These were @removed too soon. We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.
bug:
22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
Jason Monk [Tue, 28 Jul 2015 18:22:30 +0000 (18:22 +0000)]
am
35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev
* commit '
350662197542d406df58aa65afddc9e23f9309d3':
Fix network name not showing in QS sometimes
Jason Monk [Tue, 28 Jul 2015 18:05:49 +0000 (18:05 +0000)]
Merge "Fix network name not showing in QS sometimes" into mnc-dev
Tyler Gunn [Tue, 28 Jul 2015 15:07:03 +0000 (15:07 +0000)]
Merge "Add child_address call extra." into mnc-dr-dev
Jason Monk [Tue, 28 Jul 2015 13:18:08 +0000 (09:18 -0400)]
Add sizes to SysUI tests
Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
Adam Lesinski [Tue, 28 Jul 2015 01:20:21 +0000 (01:20 +0000)]
am
60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
* commit '
602611375b11805f74ae52f5d62a944c74f967d6':
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
Lorenzo Colitti [Tue, 28 Jul 2015 01:20:16 +0000 (01:20 +0000)]
am
e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '
e288b3af14421731d8f477b97e8d77588f20498b':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Adam Lesinski [Tue, 28 Jul 2015 01:06:14 +0000 (01:06 +0000)]
Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
Lorenzo Colitti [Tue, 28 Jul 2015 01:03:44 +0000 (01:03 +0000)]
Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* changes:
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Jorim Jaggi [Tue, 28 Jul 2015 00:50:49 +0000 (00:50 +0000)]
am
965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
* commit '
965bab2bae4198deaa929c8f36e44c561fb2c72c':
Allow assist gesture when notification shade is expanded
Jorim Jaggi [Tue, 28 Jul 2015 00:48:42 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (1/2)
Bug:
22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
Jorim Jaggi [Tue, 28 Jul 2015 00:36:14 +0000 (00:36 +0000)]
Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
Mady Mellor [Tue, 28 Jul 2015 00:22:32 +0000 (00:22 +0000)]
am
beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit '
beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49':
Allow text selection handles to scroll horizontally
Ruben Brunk [Tue, 28 Jul 2015 00:22:28 +0000 (00:22 +0000)]
am
ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
* commit '
ee2a16b551a2203deda6250836d8e75a9a046b7e':
Update DngCreator to correctly handle array sizes.
Adam Lesinski [Tue, 28 Jul 2015 00:19:23 +0000 (17:19 -0700)]
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
In practice I've seen the reported time spent in all WiFi energy states ~20 milliseconds larger
than the time between samples, which seems reasonable.
This will reduce false positives in APR.
Bug:
22774068
Change-Id: Ibf33c9826586c8a1b70449b9a609cb51bdfc08b8
Mady Mellor [Tue, 28 Jul 2015 00:16:49 +0000 (00:16 +0000)]
Merge "Allow text selection handles to scroll horizontally" into mnc-dev
Adam Lesinski [Tue, 28 Jul 2015 00:16:38 +0000 (00:16 +0000)]
am
fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '
fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
AAPT: Fix printing of resource configurations
Filip Gruszczynski [Tue, 28 Jul 2015 00:16:34 +0000 (00:16 +0000)]
am
f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit '
f63800ddcc68944532f7842b6ebf80898147ed4d':
Remove unnecessary relayout call from traversals.
Ruben Brunk [Tue, 28 Jul 2015 00:11:36 +0000 (00:11 +0000)]
Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
Adam Lesinski [Tue, 28 Jul 2015 00:08:45 +0000 (00:08 +0000)]
Merge "AAPT: Fix printing of resource configurations" into mnc-dev
Filip Gruszczynski [Tue, 28 Jul 2015 00:04:44 +0000 (00:04 +0000)]
Merge "Remove unnecessary relayout call from traversals." into mnc-dev
Adam Lesinski [Mon, 27 Jul 2015 23:53:14 +0000 (16:53 -0700)]
AAPT: Fix printing of resource configurations
Print out proper, copied configuration. We add fields to ResTable_config
and if we don't copy and fill in defaults when reading old configurations,
we end up with garbage values. This can potentially cause a crash as well.
Bug:
22773426
Change-Id: I64f5ebe73ee72453bcdad3a19e48f8e7ad58e9c2
Fyodor Kupolov [Mon, 27 Jul 2015 23:56:29 +0000 (23:56 +0000)]
am
67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
* commit '
67a32c499177d41e48c3ac5a803f883fd97acf37':
Added missing check for MANAGE_USERS
Fyodor Kupolov [Mon, 27 Jul 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Added missing check for MANAGE_USERS" into mnc-dev
Tyler Gunn [Mon, 27 Jul 2015 23:06:16 +0000 (16:06 -0700)]
Add "Call subject" capability to phone accounts.
Indicates whether the phone account supports displaying a subject line
for incoming calls and sending a subject line for outgoing calls.
Supports the IMS Instant Lettering feature.
Bug:
22769741
Change-Id: I6d803dc288bfd6d4e356310a8d10d5468c5d4186
Ruben Brunk [Wed, 22 Jul 2015 00:51:54 +0000 (17:51 -0700)]
Update DngCreator to correctly handle array sizes.
- Allow both pixelArraySize and preCorrectionArraySize
buffer dimensions for input buffers.
- Adjust crop, active area, and dimensions used for
opcode lists based on the input buffer size.
Bug:
22302614
Bug:
22210811
Change-Id: I16fb8921a144b0a251d555037ca45fdc12f7dd18
Raph Levien [Mon, 27 Jul 2015 21:56:43 +0000 (21:56 +0000)]
am
e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev
* commit '
e827c2525a6b76c130d2b877fbcdcf62b0ce42eb':
Allow soft hyphens in languages without patterns
Jeff Sharkey [Mon, 27 Jul 2015 21:56:38 +0000 (21:56 +0000)]
am
2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
* commit '
2e606d7be5275f2bff4c5755351bc3191ecb1bf1':
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Raph Levien [Mon, 27 Jul 2015 21:50:16 +0000 (21:50 +0000)]
Merge "Allow soft hyphens in languages without patterns" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 21:30:59 +0000 (14:30 -0700)]
Added missing check for MANAGE_USERS
setUserRestriction should do the same permission check as setUserRestrictions
method.
Bug:
22767990
Change-Id: I01f0508ebb23deafaa32ad5dd7063b98a78641be
Jeff Sharkey [Mon, 27 Jul 2015 21:19:54 +0000 (14:19 -0700)]
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Bug:
22697024
Change-Id: Ib7277e8850a49909e5d8d5ad5502cd9315cddf0b
Aravind Akella [Sat, 25 Jul 2015 00:35:31 +0000 (17:35 -0700)]
Call getInstanceForPackage instead of creating a new SensorManager instance.
Bug:
22529981
Change-Id: Id3adfbcf55d1268db1a555c72a06456a5219c086
Selim Cinek [Mon, 27 Jul 2015 21:02:47 +0000 (21:02 +0000)]
am
71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev
* commit '
71bfb27013f983bc4a54f1924af61c07732f994e':
Added the content description for the fingerprint icon
Selim Cinek [Mon, 27 Jul 2015 20:51:57 +0000 (20:51 +0000)]
Merge "Added the content description for the fingerprint icon" into mnc-dev
Adam Lesinski [Mon, 27 Jul 2015 20:21:20 +0000 (20:21 +0000)]
am
fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
* commit '
fc28d6fc9dec30e4cd98cc894d596f7df986f5b9':
BatteryStats: Prevent BatteryService from blocking
Raph Levien [Mon, 27 Jul 2015 20:06:24 +0000 (13:06 -0700)]
Allow soft hyphens in languages without patterns
This patch sets up an "empty" hyphenator, which it uses by default
for locales in which there is no hyphenation pattern data. This has
the effect of enabling soft hyphens (U+00AD), which were otherwise
disabled, because the "no-hyphen" code path didn't consider them.
Bug:
19605972
Change-Id: I4dcb95cee8edc48495f7c38736f5abf26fa04935
Julia Reynolds [Mon, 27 Jul 2015 20:03:28 +0000 (20:03 +0000)]
am
f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '
f68e0236a67a8d6f8ec167df0daf332221149b51':
Allow Settings to set background data restrict on secondary users.
George Mount [Mon, 27 Jul 2015 20:03:24 +0000 (20:03 +0000)]
am
4ba1820b: Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
* commit '
4ba1820b34c215b9f844ccd06373669d9137d27c':
Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
Adam Lesinski [Mon, 27 Jul 2015 20:01:34 +0000 (20:01 +0000)]
Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
Julia Reynolds [Mon, 27 Jul 2015 19:51:24 +0000 (19:51 +0000)]
Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
Jason Monk [Mon, 27 Jul 2015 19:44:30 +0000 (19:44 +0000)]
am
66179430: Merge "Fix QS switch accessibility problem" into mnc-dev
* commit '
661794307a792690d7608dc81b4e1299937a8f67':
Fix QS switch accessibility problem
Svetoslav Ganov [Mon, 27 Jul 2015 19:44:26 +0000 (19:44 +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
George Mount [Mon, 27 Jul 2015 19:39:28 +0000 (12:39 -0700)]
Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
This reverts commit
01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d, reversing
changes made to
b83b5fa641847ee1d533253ba5e1a3e13913b9d9.
This change is valid for mnc-dev and other mnc branches.
Jason Monk [Mon, 27 Jul 2015 19:27:29 +0000 (19:27 +0000)]
Merge "Fix QS switch accessibility problem" into mnc-dev
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:18:37 +0000 (19:18 +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)
Jason Monk [Mon, 27 Jul 2015 19:17:14 +0000 (15:17 -0400)]
Fix QS switch accessibility problem
Set the switch state so it can be read back correctly.
Bug:
22710906
Change-Id: I2bcba96e53813118eb2be8dcb7e0b7d547767550
Julia Reynolds [Mon, 27 Jul 2015 19:10:42 +0000 (15:10 -0400)]
Allow Settings to set background data restrict on secondary users.
Bug:
22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
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
Filip Gruszczynski [Mon, 27 Jul 2015 15:52:50 +0000 (08:52 -0700)]
Remove unnecessary relayout call from traversals.
All the necessary information (most importantly outsets) arrives in
addWindowToDisplay that is happening a few lines earlier.
Bug:
22073222
Change-Id: I483e98808877f32812c0e959cdfc14b4e0ca5e62
Adam Lesinski [Mon, 27 Jul 2015 18:43:05 +0000 (11:43 -0700)]
BatteryStats: Prevent BatteryService from blocking
BatteryService is a low level service, and we shouldn't have it
block in BatteryStatsService while collecting external data from
components like WiFi. Deadlocks can occur this way.
Bug:
22559655
Change-Id: I64026453d191695eb583a47163ab6f48f882b085
George Mount [Mon, 27 Jul 2015 18:41:43 +0000 (18:41 +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 18:05:57 +0000 (18:05 +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 18:05:53 +0000 (18:05 +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 18:05:48 +0000 (18:05 +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:07 +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:02:38 +0000 (15:02 +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:02:35 +0000 (15:02 +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