208632 Commits

Author SHA1 Message Date
Dianne Hackborn
5507bb41b0 Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 2015-07-23 00:35:34 +00:00
Steve McKay
709b61de16 Pick column count based on available space.
Set background color of RecyclerView.

BUG: 22640007
BUG: 22672201
Change-Id: Ic9c65a2a25164698bc08b4620bfa0b067d620f1b
2015-07-22 17:29:10 -07:00
Svetoslav Ganov
41a62e111d Merge "Do not show normal permissions in sideloading UI" into mnc-dev 2015-07-23 00:27:16 +00:00
Dianne Hackborn
d48954fb6b Fix issue #22414729: Checkin start clock time is different from hsitory reset time
There was a mistake in the code that was supposed to recover from the
initial time on a new device being bad until the real time ultimately
gets set, which was causing us to update the start clock time every time
there was a time change (instead of just when the original start time
appears bad).

Rework all of this, so we now count the start time as bad if it is more
than one year before the current time, only modifying it in that case.
Also when modifying it, adjust the time we set it to take in to account
how much realtime has actually elapsed so far in the battery stats.

Change-Id: If74bd711d9b7618c8f6148a9935c452aaaa7e257
2015-07-22 17:26:32 -07:00
Svetoslav
a3f68ef2f6 Do not show normal permissions in sideloading UI
bug:22627493

Change-Id: I5bb900bb2cd68893c21d9e9b2c973d331d355b58
2015-07-22 17:05:05 -07:00
Dianne Hackborn
3e8125b40e Fix issue #22653116: Google App crashing on NYT app
We weren't correctly handling the root view of the window --
we were just pushing it on to the stack, but that means it got
written at the end.  Instead, we now immediately write it
after the window and let things follow from there.

Change-Id: I070c96bd2443f312a7c6f495d1bf72fa19c614d6
2015-07-22 17:02:10 -07:00
Fyodor Kupolov
a0a71d8a22 Merge "Fixed a typo" into mnc-dev 2015-07-22 23:57:00 +00:00
Adam Lesinski
05f5cb4599 Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 2015-07-22 23:41:39 +00:00
Adrian Roos
58adc7ad48 Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 2015-07-22 23:22:42 +00:00
Adrian Roos
7748ea5fcd Merge "Protect demo mode commands with permission" into mnc-dev 2015-07-22 23:10:09 +00:00
Adam Lesinski
e03f17c82e UsageStats: Gracefully handle corrupt filenames
Not sure how useful this is, since renames should be atomic. If the filesystem
is corrupt I'm sure other parts of the system will break. Good to be safe though!

Bug:22172659
Change-Id: Iad339be2869d170bcf736c59feb93830a51905e1
2015-07-22 16:01:45 -07:00
Filip Gruszczynski
31d300f914 Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

This is a cherry pick that somehow didn't get through to master.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
2015-07-22 15:46:06 -07:00
Fyodor Kupolov
959991b957 Fixed a typo
Change-Id: I85d75429baed3263c04e747eb374c66177c064f5
2015-07-22 15:25:55 -07:00
Jae Seo
eec3d9e368 Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 2015-07-22 22:22:32 +00:00
Svetoslav Ganov
3d6f606031 Merge "Add a privileged permission to get user accounts" into mnc-dev 2015-07-22 21:41:40 +00:00
John Reck
3f2c51084b Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 2015-07-22 21:29:55 +00:00
Adam Lesinski
6625047a3b Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 2015-07-22 21:28:37 +00:00
Nick Kralevich
3b0bbd7b96 Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 2015-07-22 21:18:59 +00:00
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
John Reck
c360bef7bc Fix ATLAS_MAP_ENTRY_FIELD_COUNT
Bug: 22558805

Change a039182d6157bc0487df4ad8e373685c9dd7d662 reduced
the size of an entry from 4 fields to 3, but failed to
update the constant that determined the size of the java long[].

Because the long[] is blindly passed down through to native, this
will result in reading past the end of the array as the size
is no longer a multiple of the number of fields being read so
the loop will not terminate until 1 iteration past the end.

Change-Id: I2f8e26cec9a60b3a74739a3763203296be5f1fd6
2015-07-22 20:58:09 +00:00
Adam Lesinski
8a83c61497 BatteryStats: Use English locale for dump and checkin data
Dump and checkin data is read by tools that expect a consistent
locale.

Bug:22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
2015-07-22 13:50:23 -07:00
Fred Chung
9478ddfa11 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().
2015-07-22 20:41:41 +00: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
Dianne Hackborn
8635041115 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...
2015-07-22 20:24:30 +00:00
Alex Klyubin
568e67a322 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.
2015-07-22 20:24:21 +00:00
Wale Ogunwale
aecf9ba839 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
2015-07-22 20:24:10 +00:00
Kenny Guy
2adcb40d2c 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.
2015-07-22 20:24:05 +00:00
Jason Monk
1df7e13519 am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev
* commit '41cfd3f8c0df036345807f87b828b4b68bdaffdf':
  Fix blank tiles on QS rotate
2015-07-22 20:24:00 +00:00
Jason Monk
67091f46fa am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev
* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl
2015-07-22 20:23:55 +00:00
Jim Miller
4a31ee0a74 am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.
* commit '091f0e5c6c7f9e72a6e661c4849a2e232823075b':
  Make FingerprintService more tolerant of fingerprintd crashes.
2015-07-22 20:23:41 +00:00
Svetoslav Ganov
010b53c029 am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev
* commit 'bdb7d936512a39b6c06411d11a26824b82e5727f':
  Update permission icons to final versions - framework
2015-07-22 20:23:28 +00:00
George Mount
27fbd360a8 am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
2015-07-22 20:23:02 +00:00
Jorim Jaggi
fcf9acb95a 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
2015-07-22 20:22:56 +00:00
Nick Kralevich
b210026e3d UsbDeviceManager: fix b/21429947 regression
As discussed in b/21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.

Always ensure that MTP is the default driver mode.

Get rid of one use of the persistent property. The persistent property
was already pulled from a number of devices, and as explained in
commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c, the intent was that
the persistent property would only hold the persistent adb state.

Bug: 22447614
Bug: 21429947
Change-Id: I8b3690a1bafb7cea0d5a69d73c1065c7fc64c653
2015-07-22 12:59:47 -07:00
xin He
15a45e02c3 Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 2015-07-22 19:47:53 +00:00
Steve McKay
503648ddc3 Apply hirono@'s logic for disabling delete action
...when selection contains non-deletable items.

BUG=22441292
Change-Id: I716e5c1f685c9f3d12b01b193753775094cde481
2015-07-22 12:46:15 -07: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
Jae Seo
345af96677 TIF: Enable hardware acceleration on overlay
Bug: 18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
2015-07-22 12:34:17 -07: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
Adrian Roos
0b923a2968 Fix cut off charging indication in certain scripts
Bug: 22620003
Change-Id: Ib9d8eb4bb0442db86c35374435086e04e71742d7
2015-07-22 12:17:54 -07: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
Adrian Roos
b30f841cb4 resolved conflicts for merge of c1244a29 to mnc-dr-dev
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
2015-07-22 12:00:56 -07:00
Steve McKay
3b409d01b9 Push equals impl into SparseBooleanArray.
Also, implement hashcode, because it is naughty to not.

Change-Id: I2042dac6840cf07027871783a7b6763578fa805d
2015-07-22 11:53:14 -07: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