drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,847 Commits 1 Branch 0 Tags
Commit Graph

194847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
c37c7d9dbe Merge "Do not require USE_FINGERPRINT for getAuthenticatorId." into mnc-dev 2015-06-12 00:25:42 +00:00
Navtej Singh Mann
3c0ce5ca14 fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
bug: 21663831
Change-Id: I9aea30907aae00c98d8fb1dc1fff3f4935108fa4
 2015-06-11 17:04:15 -07:00
Sungsoo Lim
d7118bcc31 Merge "Make MediaRouteControllerDialog scrollable" into mnc-dev 2015-06-11 23:52:04 +00:00
Rich Slogar
4669f4d674 am 6e56db8b: am e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs 
* commit '6e56db8b7b12799428bcdbd06728170600c09286':
  docs: sdk tools 24.3.2 updates
 2015-06-11 23:36:25 +00:00
Rich Slogar
6e56db8b7b am e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs 
* commit 'e9dd30b27687ecc0e152f73eec05399af1c04bb3':
  docs: sdk tools 24.3.2 updates
 2015-06-11 23:25:13 +00:00
Eric Gilmore
afccf1f63d am fb91c81f: am 2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-preview-docs 
* commit 'fb91c81fc583c2ad5ad895c7bf87675827a4af31':
  Removing traces out outdated GCM training class.
 2015-06-11 23:23:44 +00:00
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +00:00
Joe Fernandez
d5d2a5010e am 480d6e8e: am e4e40c03: docs: remove obsolete FAQ pages 
* commit '480d6e8e08c2d5ae6cd4ce51ef02948202621a17':
  docs: remove obsolete FAQ pages
 2015-06-11 23:11:28 +00:00
Rich Slogar
e9dd30b276 Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs 2015-06-11 23:09:27 +00:00
Eric Gilmore
fb91c81fc5 am 2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-preview-docs 
* commit '2f414b7612e095c383fb4052c671634d82940654':
  Removing traces out outdated GCM training class.
 2015-06-11 23:08:56 +00:00
Eric Gilmore
2f414b7612 Merge "Removing traces out outdated GCM training class." into mnc-preview-docs 2015-06-11 22:58:33 +00:00
Joe Fernandez
480d6e8e08 am e4e40c03: docs: remove obsolete FAQ pages 
* commit 'e4e40c0347e76ea4afaf7d442c4daeb9f08b2d91':
  docs: remove obsolete FAQ pages
 2015-06-11 22:56:20 +00:00
Rich Slogar
01572eaa1e docs: sdk tools 24.3.2 updates 
Change-Id: I3eb7b789985653614361505eea3aa0040ef5ea52
 2015-06-11 15:55:43 -07:00
Keisuke Kuroyanagi
4039f6570c Merge "Improve boundary check for for Paint#DrawTextRun." into mnc-dev 2015-06-11 22:44:55 +00:00
Joe Fernandez
e4e40c0347 docs: remove obsolete FAQ pages 
These pages have not been maintained and have not been included in the
DAC navigation structure for some time.

b/19413080

redirects change: If512bdf55b16f0faf21de7db81ab26d59489da15

Change-Id: Ibc1aa5c691edb938cbb7d4b2d885f1ea8a5f6ef4
 2015-06-11 15:41:44 -07:00
Fyodor Kupolov
421eaa7813 Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev 2015-06-11 22:29:21 +00:00
Fyodor Kupolov
1f450dbfbc Fixed NPE when dumpSettings is called with a null cursor 
Bug: 20070414
Change-Id: I15d5d2ae27a7892807221421778082e0f29a36ff
 2015-06-11 15:25:59 -07:00
Ruben Brunk
dcb9e169d7 Merge "Set scaling mode for legacy device surfaces." into mnc-dev 2015-06-11 22:15:58 +00:00
Ruben Brunk
a94c603345 Set scaling mode for legacy device surfaces. 
Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218
 2015-06-11 15:15:17 -07:00
Wale Ogunwale
af7289dfa3 Merge "Revert "Enabled WMS.DEBUG_STARTING_WINDOW"" into mnc-dev 2015-06-11 22:12:22 +00:00
Adam Lesinski
2e49bfa6f0 Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 2015-06-11 22:02:37 +00:00
Adam Lesinski
c8e8729244 UsageStats: Change INTERACTION to SYSTEM_INTERACTION 
SYSTEM_INTERACTION events are signals to the system for a package's
implicit actions (service bound, etc).

These should not affect the API visible stats like lastTimeUsed, etc.
USER_INTERACTION is for user initiated actions (notification interaction, etc).

Bug:21761781
Change-Id: I4585cf35fbb158612a3c737710108bec34e89183
 2015-06-11 22:01:45 +00:00
Dimitry Ivanov
06f3cd8e8b Merge "Make apk entry separator compliant with jar url format" into mnc-dev 2015-06-11 21:55:02 +00:00
Dmitriy Ivanov
99fc7e95c5 Merge "Add path to native libraries inside apk" into mnc-dev 2015-06-11 21:55:01 +00:00
Wale Ogunwale
42892ec641 Merge "Prevent system uid component from running in an app process" into mnc-dev 2015-06-11 21:48:55 +00:00
Adrian Roos
b44f5486ef Fix accessibility bounds 
Follow up to Ifcc5bd7258c00ebd3a64ca4a4edd894e3baf0ccc
Bug: 21763049

Change-Id: I3026b22848ef1552e2faa82d9e0f4409d2cba63a
 2015-06-11 21:48:32 +00:00
Dianne Hackborn
5c192da182 Merge "Fix build." into mnc-dev 2015-06-11 21:32:24 +00:00
Dianne Hackborn
ebef1608ba Fix build. 
Change-Id: I3da590a03e1c7ff0862f69bbb4967687970a98e1
 2015-06-11 14:28:07 -07:00
Carlos Valdivia
b3c134e161 Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 2015-06-11 21:18:03 +00:00
Carlos Valdivia
6eb73a5778 Revert "Revert "Permissions: Fix account related permissions."" 
This reverts commit dcddc476651deb72a27798de56eef584e5be5d32.

Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe
 2015-06-11 14:10:04 -07:00
Dianne Hackborn
f16747db09 Add ArraySet to the SDK. 
Also fix some documentation.

Change-Id: I46025c3b5450e7cd671135b99ff3b298e223651d
 2015-06-11 13:53:13 -07:00
Jason Monk
54380c741b Merge "Fix CarrierText airplane mode with no sims" into mnc-dev 2015-06-11 20:47:49 +00:00
Alex Klyubin
a99b8b5e3f Do not require USE_FINGERPRINT for getAuthenticatorId. 
This removes the requirement to hold the USE_FINGERPRINT permission
to successfully invoke FingerprintManager.getAuthenticatorId().

This is needed because Android Keystore classes which run inside app
processes occasionally need to access this authenticator ID. The
access however is not necessarily triggered by the developer using
APIs to do with fingerprints. Thus, if an app does not hold the
USE_FINGERPRINT permission and uses Android Keystore API, it may
unexpectedly encounter a SecurityException.

It's OK to provide access to authenticator ID without requiring
USE_FINGERPRINT permission because there are other ways to access
this ID without holding that permission, such as though hidden
KeyStore API.

Once Android Keystore code is restructured to no longer require
access to authenticator ID, this CL can be reverted.

Bug: 21030147
Change-Id: I9af29830abce34c46e29e5c1682cc3ab88c95c00
 2015-06-11 13:41:04 -07:00
John Spurlock
06a9fdc4ea Merge "A11y: Use a backstop dialog timeout when a11y is enabled." into mnc-dev 2015-06-11 20:35:53 +00:00
Ruben Brunk
c2b409267e Merge "Fix intermediate preview size selection for legacy." into mnc-dev 2015-06-11 20:29:28 +00:00
Yin-Chia Yeh
dba1cf3d51 Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 2015-06-11 20:29:28 +00:00
Chris Craik
1b83edc616 Merge "Workaround shader crash" into mnc-dev 2015-06-11 20:29:05 +00:00
Amit Mahajan
02184244dc Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev 2015-06-11 20:26:41 +00:00
Zheng Fu
dfd93c69c0 Merge "Revert contact metadata_sync constants." into mnc-dev 2015-06-11 20:24:59 +00:00
Adam Lesinski
df85c12ba5 Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 2015-06-11 20:24:31 +00:00
Roozbeh Pournader
51dd6a16f7 Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev 2015-06-11 20:19:43 +00:00
John Spurlock
f09838be84 A11y: Use a backstop dialog timeout when a11y is enabled. 
- Or more precisely, whenever a non-generic-only a11y service
   is enabled.

Bug: 21360311
Change-Id: I9e65b7f690d5b670b2d8e944b7d87e0fd1bce327
 2015-06-11 16:14:44 -04:00
Roozbeh Pournader
5225620508 Merge EXTENDED font profile with the next (unnamed) profile. 
This is now possible since we have less space restrictions on
devices.

This helps make sure that devices don't mistakenly ship with a
limited font support simply because they didn't turn on the extended
font profile.

Although the larger version of Droid Sans Fallback is no longer used
in any font profile for a device, it is kept since it's used by the
SDK.

The Nanum Gothic font is no longer used in any device profile either,
but it's kept in the fallback chain, so the SDK (that uses it)
continues to work.

Bug: 19668057
Change-Id: I6e32c4c98745e9b6aff6684d993943a19aebf6f7
 2015-06-11 13:06:48 -07:00
Jason Monk
00a34ab54c Merge "Protect against null detail record." into mnc-dev 2015-06-11 20:06:11 +00:00
Carlos Valdivia
d0041e5f47 Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 2015-06-11 20:04:44 +00:00
Wale Ogunwale
44368567f8 Prevent system uid component from running in an app process 
Bug: 21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
 2015-06-11 13:04:20 -07:00
Carlos Valdivia
dcddc47665 Revert "Permissions: Fix account related permissions." 
This reverts commit ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
 2015-06-11 20:04:04 +00:00
Yin-Chia Yeh
ec743ee9a4 Camera2: Legacy: handle FPS range properly 
Convert between the FPS range unit of API1 and API2.

Bug: 21754853
Change-Id: I823e533eeac3bf8beb7b975fe296b309300e2b05
 2015-06-11 12:57:49 -07:00
Jason Monk
78dcee592b Protect against null detail record. 
Bug: 21779477
Change-Id: I70abe5d88f7ca0db782182937f5b73a9e9be1f5a
 2015-06-11 15:57:41 -04:00
Jeff Sharkey
c8488e99e8 Merge "Ignore some more generic USB device names." into mnc-dev 2015-06-11 19:57:25 +00:00