Commit Graph

197671 Commits

Author SHA1 Message Date
Chris Tate
751a96a040 Merge "Don't redundantly call transport.finishRestore()" into mnc-dev 2015-07-28 22:56:41 +00:00
Zach Johnson
5faa033615 Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 2015-07-28 22:36:30 +00:00
Todd Kennedy
f2c616ed02 Merge "Partially revert package freezing" into mnc-dev 2015-07-28 22:15:43 +00:00
Christopher Tate
6ab2fb61f0 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
2015-07-28 14:04:04 -07:00
Todd Kennedy
6b0c8315e4 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
2015-07-28 13:52:49 -07:00
Tyler Gunn
bdbec480e8 Merge "Add "Call subject" capability to phone accounts." into mnc-dev 2015-07-28 20:07:40 +00:00
Dianne Hackborn
3551a59b27 Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 2015-07-28 19:52:53 +00:00
Dianne Hackborn
57dd737443 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
2015-07-28 12:52:11 -07:00
Jorim Jaggi
850dd6907f Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev 2015-07-28 19:49:44 +00:00
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Robert Greenwalt
a36c074052 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
2015-07-28 11:41:31 -07:00
Jason Monk
3506621975 Merge "Fix network name not showing in QS sometimes" into mnc-dev 2015-07-28 18:05:49 +00:00
Adam Lesinski
602611375b Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev 2015-07-28 01:06:14 +00:00
Lorenzo Colitti
e288b3af14 Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:03:44 +00:00
Jorim Jaggi
1dfa7c6c79 Don't use screenshot if structure is disabled (1/2)
Bug: 22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
2015-07-27 17:49:00 -07:00
Jorim Jaggi
965bab2bae Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 2015-07-28 00:36:14 +00:00
Adam Lesinski
4c9ace51db 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
2015-07-27 17:19:23 -07:00
Mady Mellor
beb6e66817 Merge "Allow text selection handles to scroll horizontally" into mnc-dev 2015-07-28 00:16:49 +00:00
Ruben Brunk
ee2a16b551 Merge "Update DngCreator to correctly handle array sizes." into mnc-dev 2015-07-28 00:11:36 +00:00
Adam Lesinski
fd44b56d59 Merge "AAPT: Fix printing of resource configurations" into mnc-dev 2015-07-28 00:08:45 +00:00
Filip Gruszczynski
f63800ddcc Merge "Remove unnecessary relayout call from traversals." into mnc-dev 2015-07-28 00:04:44 +00:00
Adam Lesinski
5b0f1be0a2 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
2015-07-27 17:04:43 -07:00
Fyodor Kupolov
67a32c4991 Merge "Added missing check for MANAGE_USERS" into mnc-dev 2015-07-27 23:43:32 +00:00
Tyler Gunn
65a3d3430a 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
2015-07-27 16:06:16 -07:00
Ruben Brunk
2079612e58 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
2015-07-27 22:48:13 +00:00
Raph Levien
e827c2525a Merge "Allow soft hyphens in languages without patterns" into mnc-dev 2015-07-27 21:50:16 +00:00
Fyodor Kupolov
d4b2604109 Added missing check for MANAGE_USERS
setUserRestriction should do the same permission check as setUserRestrictions
method.

Bug: 22767990
Change-Id: I01f0508ebb23deafaa32ad5dd7063b98a78641be
2015-07-27 14:32:54 -07:00
Jeff Sharkey
2e606d7be5 Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Bug: 22697024
Change-Id: Ib7277e8850a49909e5d8d5ad5502cd9315cddf0b
2015-07-27 14:25:11 -07:00
Selim Cinek
71bfb27013 Merge "Added the content description for the fingerprint icon" into mnc-dev 2015-07-27 20:51:57 +00:00
Raph Levien
a00896198d 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
2015-07-27 13:06:24 -07:00
Adam Lesinski
fc28d6fc9d Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 2015-07-27 20:01:34 +00:00
Julia Reynolds
f68e0236a6 Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 2015-07-27 19:51:24 +00:00
George Mount
4ba1820b34 Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
This reverts commit 01fe3f86b1, reversing
changes made to b83b5fa641.

This change is valid for mnc-dev and other mnc branches.
2015-07-27 12:39:28 -07:00
Jason Monk
661794307a Merge "Fix QS switch accessibility problem" into mnc-dev 2015-07-27 19:27:29 +00:00
Svetoslav Ganov
8a54da92ce Merge "Pass correct extras to the custom print options activity" into mnc-dev 2015-07-27 19:23:37 +00:00
Jason Monk
fc2506255f Fix QS switch accessibility problem
Set the switch state so it can be read back correctly.

Bug: 22710906
Change-Id: I2bcba96e53813118eb2be8dcb7e0b7d547767550
2015-07-27 15:17:14 -04:00
Julia Reynolds
72f83d6a05 Allow Settings to set background data restrict on secondary users.
Bug: 22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
2015-07-27 15:10:42 -04:00
Jorim Jaggi
9e49b5d679 Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 2015-07-27 18:55:29 +00:00
Filip Gruszczynski
9b621a72e2 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
2015-07-27 11:44:31 -07:00
Adam Lesinski
d7616ef73c 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
2015-07-27 11:43:05 -07:00
George Mount
01fe3f86b1 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"
2015-07-27 18:24:40 +00:00
George Mount
1c964bece6 Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
This reverts commit c571a9a1d0, reversing
changes made to a29cfefe2c.

This should fix the build break for LMP downstream branches.

Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17
2015-07-27 10:39:54 -07:00
Fyodor Kupolov
b83b5fa641 Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 2015-07-27 17:27:02 +00:00
Chris Craik
4604c1dc67 Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev 2015-07-27 17:23:52 +00:00
Phil Burk
fef1b28917 Merge "MIDI: fix running status parser" into mnc-dev 2015-07-27 17:15:04 +00:00
Tim Volodine
91b31b5312 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 2015-07-27 16:37:57 +00:00
Tim Volodine
4961105a7d Revert "Invoke geolocation permissions callback with denied state by default."
This reverts commit 954d1333c4.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Bug: 22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit 0bb7d2e467)
2015-07-27 16:20:29 +00:00
George Mount
9c450936aa am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
  Update data binding for RC1.
2015-07-27 14:49:16 +00:00
George Mount
c0231f26fe 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.
2015-07-27 14:49:11 +00:00
George Mount
c571a9a1d0 am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
  Update data binding for RC1.
2015-07-27 14:35:50 +00:00