Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,028 Commits 3 Branches 0 Tags
586116a59ea09ec40e31a0972b629caac6348549
Commit Graph

53701 Commits

Author SHA1 Message Date
Svetoslav Ganov
586116a59e am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev 
* commit '41a62e111d8de8e64ffc61c176add6cc6217b960':
  Do not show normal permissions in sideloading UI
 2015-07-23 19:19:38 +00:00
Adam Lesinski
92638a0ca9 am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '6625047a3ba26ecc52bb2757eb7576027949e435':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-23 19:18:59 +00:00
Alan Viverette
be01800d76 am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '9478bf0e6f9618b8a5b844deaf548fc5ad1ff024':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-23 19:18:42 +00:00
Fyodor Kupolov
2a37b2fff2 am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '5ef70b02ead0a1e164370fefaff27bfd1ce0d492':
  Added a note about location permission
 2015-07-23 19:18:34 +00:00
Jeff Sharkey
e87dc6dba5 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
 2015-07-23 19:18:25 +00:00
Jason Monk
7254832501 am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '4fc1b707442451f4a826929fc7e72967d443c73f':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-23 19:18:20 +00:00
Dianne Hackborn
419f2177c8 am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-23 19:18:10 +00:00
Svetoslav Ganov
41a62e111d Merge "Do not show normal permissions in sideloading UI" into mnc-dev 2015-07-23 00:27:16 +00:00
Svetoslav
a3f68ef2f6 Do not show normal permissions in sideloading UI 
bug:22627493

Change-Id: I5bb900bb2cd68893c21d9e9b2c973d331d355b58
 2015-07-22 17:05:05 -07: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
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
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
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
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
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
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
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
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
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
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
Fyodor Kupolov
cf6500b9ba am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 20:50:24 +00:00
Fyodor Kupolov
55a116d00c Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 2015-07-21 20:32:28 +00:00
Adam Lesinski
a50f43e002 am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:40:24 +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
Svetoslav
358af14345 am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev 
* commit '81adda25b396ee3db794bc9a7946b579d01c2aa0':
  Always create nodes for views backed by an adapter.
 2015-07-21 19:12:13 +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
Raph Levien
7026617e74 am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev 
* commit '1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
  Respect style boundaries when measuring text
 2015-07-21 17:04:36 +00:00
Raph Levien
1fcb6d3ae2 Merge "Respect style boundaries when measuring text" into mnc-dev 2015-07-21 16:55:39 +00:00
Jorim Jaggi
740452e875 Touch, wake and unlock 
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
 2015-07-20 23:52:20 +00:00
Jorim Jaggi
e58ba842de am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
  Fix SysUI crashes on svelte devices
 2015-07-20 23:24:21 +00:00
Raph Levien
ea2b4a40f7 Respect style boundaries when measuring text 
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.

This patch changes the invocation of getRunAdvance to measure only
within the style span.

Bug: 22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
 2015-07-20 16:22:01 -07:00
Jorim Jaggi
8924f23d3e Merge "Fix SysUI crashes on svelte devices" into mnc-dev 2015-07-20 23:09:46 +00:00
Alan Viverette
783b3d9d09 am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev 
* commit '001f1e7eb35630df24d53298c1a3d2de055d7ce9':
  Add missing invalidation check to drawable cache
 2015-07-20 22:59:33 +00:00
Jorim Jaggi
e446dcee8f Fix SysUI crashes on svelte devices 
Bug: 22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
 2015-07-20 15:47:15 -07:00
Alan Viverette
001f1e7eb3 Merge "Add missing invalidation check to drawable cache" into mnc-dev 2015-07-20 22:44:47 +00:00
Dianne Hackborn
609cb58533 am a7ce2344: Merge "Fix issue #22564918: Request is inactive" into mnc-dev 
* commit 'a7ce23440328e63f36a4add05199aa84ff04032d':
  Fix issue #22564918: Request is inactive
 2015-07-20 22:44:13 +00:00