197484 Commits

Author SHA1 Message Date
Chris Wren
db2b4ba69d Merge "Don't crash sysui when advisory calls fail." into mnc-dev 2015-07-22 21:18:40 +00:00
Chris Wren
26505585a4 Don't crash sysui when advisory calls fail.
Bug: 22653721
Change-Id: I8e2fc3887b7c71f99eb02306ce308f722dba4d07
2015-07-22 17:03:17 -04:00
Tim Kilbourn
1aadfc2bc4 Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 2015-07-22 20:40:06 +00:00
Alan Viverette
9478bf0e6f Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 2015-07-22 20:35:40 +00:00
Fyodor Kupolov
5ef70b02ea Merge "Added a note about location permission" into mnc-dev 2015-07-22 20:27:06 +00:00
xin He
15a45e02c3 Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 2015-07-22 19:47:53 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Alan Viverette
5b39ec8b40 Fix handling of RelativeLayout measurement using UNSPECIFIED spec
Bug: 22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
2015-07-22 15:37:14 -04:00
Jason Monk
4fc1b70744 Merge changes from topic 'TunerLoc' into mnc-dev
* changes:
  Add metrics to tuner
  Move tuner enable point to QS
2015-07-22 19:29:59 +00:00
Jorim Jaggi
ac73f1efea 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
2015-07-22 19:21:44 +00:00
Dianne Hackborn
6f64e737f0 Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 2015-07-22 19:04:00 +00:00
Jason Monk
a403159a3b Add metrics to tuner
Bug: 22462605
Change-Id: I075f9a25630a89e85dd17603297565988c38075b
2015-07-22 14:41:02 -04:00
Jason Monk
431ad737a4 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
2015-07-22 14:40:53 -04:00
Jeff Sharkey
85ced63268 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
2015-07-22 11:11:50 -07:00
Fred Chung
db71828cb7 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().
2015-07-22 17:46:21 +00:00
wang.zhenyu
ed987a52a2 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
2015-07-22 17:45:16 +00:00
Dianne Hackborn
b73946715c Merge "Work on issue #22303510: Additional permissions aren't properly..." into mnc-dev 2015-07-22 16:14:59 +00:00
Alex Klyubin
ada70be897 Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 2015-07-22 15:24:27 +00:00
Wale Ogunwale
ff21279e2c Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 2015-07-22 14:21:31 +00:00
Kenny Guy
2ba3fec6e0 Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 2015-07-22 13:49:20 +00:00
Jason Monk
41cfd3f8c0 Merge "Fix blank tiles on QS rotate" into mnc-dev 2015-07-22 12:56:40 +00:00
Jason Monk
a910a04b8a Merge "Fix crash in NetworkControllerImpl" into mnc-dev 2015-07-22 12:54:20 +00:00
Jim Miller
091f0e5c6c 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
2015-07-22 04:07:29 +00:00
Dianne Hackborn
451c3468b9 Fix issue #22612630: Ensure SMS/Call delivery during Doze
Add whitelist timeout for SMS.

Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
2015-07-21 17:39:46 -07:00
Svetoslav Ganov
bdb7d93651 Merge "Update permission icons to final versions - framework" into mnc-dev 2015-07-22 00:06:10 +00:00
Wale Ogunwale
25073dd4a8 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
2015-07-22 00:05:39 +00:00
Dianne Hackborn
cfbfafe1b9 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
2015-07-21 17:01:15 -07:00
George Mount
7c482463cb Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 2015-07-21 22:51:27 +00:00
Jorim Jaggi
20df623459 Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 2015-07-21 22:46:30 +00:00
Fred Chung
2c3b9fb86b 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().
2015-07-21 22:16:55 +00:00
Fred Chung
3ccbf3bad5 Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 2015-07-21 22:06:15 +00:00
Jorim Jaggi
c1244a2995 Merge "Touch, wake and unlock" into mnc-dev 2015-07-21 21:53:11 +00:00
George Mount
13d7032d59 Null checks to prevent NPEs in Fragments transactions.
Bug 22631964

Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
2015-07-21 14:30:24 -07:00
Jeff Sharkey
cf051d1846 Merge "Avoid NPE when no staged installs." into mnc-dev 2015-07-21 21:23:59 +00:00
John Reck
1fddd3efa9 Merge "Mark isInUse per-window" into mnc-dev 2015-07-21 20:50:30 +00:00
Fyodor Kupolov
55a116d00c Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 2015-07-21 20:32:28 +00:00
Amith Yamasani
09ba71513b Merge "Don't kill apps that are multi-user aware..." into mnc-dev 2015-07-21 20:04:22 +00:00
Alex Klyubin
5d586dd585 Merge "KM module may consume less input than provided by finish time." into mnc-dev 2015-07-21 19:50:50 +00:00
Jorim Jaggi
19695d9711 Add callback to voice interaction session for lockscreen shown
Bug: 22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
2015-07-21 12:35:16 -07:00
Adam Lesinski
23e19066de Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 2015-07-21 19:26:45 +00:00
Christopher Tate
d9c2ff99bf Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev 2015-07-21 19:11:37 +00:00
Adam Lesinski
6856964444 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
2015-07-21 12:08:56 -07:00
Fyodor Kupolov
53019287fd Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Bug: 21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
2015-07-21 12:06:14 -07:00
Svetoslav
81adda25b3 Merge "Always create nodes for views backed by an adapter." into mnc-dev 2015-07-21 19:01:19 +00:00
Svet Ganov
39c8a08b5e Update permission icons to final versions - framework
bug:22383613

Change-Id: I3f524fd0538a1b843b0394fa766f032835d1ecaa
2015-07-21 11:57:26 -07:00
Amith Yamasani
c1cbaaba6c 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
2015-07-21 11:46:14 -07:00
Todd Kennedy
f2805bcbe1 Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 2015-07-21 18:11:19 +00:00
John Reck
00e79c9947 Mark isInUse per-window
Bug: 22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
2015-07-21 10:46:54 -07:00
Kenny Guy
2c7836befc 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
2015-07-21 18:22:28 +01:00
Nick Kralevich
673ccfd45a Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 2015-07-21 17:16:10 +00:00