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

194821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Monk
54380c741b Merge "Fix CarrierText airplane mode with no sims" into mnc-dev 2015-06-11 20:47:49 +00: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
Jeff Sharkey
47b872d9c3 Ignore some more generic USB device names. 
Bug: 21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
 2015-06-11 12:54:42 -07:00
Chris Craik
e22c59b291 Trace each stage of Choreographer driven frames 
bug:21374535

Change-Id: I332dac216defbc4517441e2a9cdffdf71731f1e6
 2015-06-11 19:51:38 +00:00
Makoto Onuki
bf2ccf9455 Merge "Fix the PFD detachFd issue." into mnc-dev 2015-06-11 19:39:17 +00:00
Eino-Ville Talvala
cd17a84a86 Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev 2015-06-11 19:36:17 +00:00
Makoto Onuki
b30ad6f5e8 Fix the PFD detachFd issue. 
Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703
 2015-06-11 12:34:22 -07:00
Adam Lesinski
31c05d1361 Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants 
This will allow gservices to tweak the settings and experiment
with different values for various doze constants.

The values are encoded in a string as a key=value list. Ex:

inactive_to=5000,idle_factor=0.01

Bug:21640379
Change-Id: Ie98a0e4893f9b46a64d961d6c5c5169b8b8ad742
 2015-06-11 12:30:47 -07:00
Amit Mahajan
59acd140b6 Change to add STK_PERMISSION for stk related commands. 
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
 2015-06-11 12:06:18 -07:00
Svet Ganov
db6ac98ec3 Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885" into mnc-dev 2015-06-11 18:52:39 +00:00
Svet Ganov
9fb3c8826c DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework 
b/20220885

Instead, move it to GSF:
ag/700092

SUBSCRIBED_FEEDS_READ/WRITE permissions guard the Content Provider
that stores sync feeds for 1p apps (Gmail, Claendar, etc).
The sync feeds are used for delivering and processing
GCM tickle-to-sync messages.

These permissions should not be used by 3rd parties but
if they were, this change will break them.

I don't know the reason these were not in GSF and 'signature'
to begin with. If someone does, please, comment.

Change-Id: I6c4e4c774fea12c7fe7082477c210ad75f007c66
 2015-06-11 11:48:56 -07:00
Jeff Sharkey
8a26514687 Merge "Selected count string needs plurals." into mnc-dev 2015-06-11 18:21:08 +00:00
Carlos Valdivia
ffb46022b3 Permissions: Fix account related permissions. 
Requires updating the docs in AccountManaager as well as the logic in
AccountManagerService.

MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going
away. Where AUTHENTCATE_ACCOUNTS was required we now do signature
matching.

GET_ACCOUNTS is kept but has been grouped under contacts.

Bug: 20136477
Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481
 2015-06-11 11:07:47 -07:00
Dirk Dougherty
cbf63d8aba am 405d58ff: am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit '405d58fff8a64833f365893d065edf3d17f60f21':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 17:57:37 +00:00
Hyungtae Tim Kim
d15e2c62e8 Merge "Add bucket that unknown state playback falls into" into mnc-dev 2015-06-11 17:53:17 +00:00
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Dirk Dougherty
405d58fff8 am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit 'fd7432276172790a27bd51b75e61d756772eb33b':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 17:40:53 +00:00
Alex Klyubin
96d7058aaa Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev 2015-06-11 17:40:09 +00:00
Dirk Dougherty
fd74322761 Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 2015-06-11 17:31:46 +00:00
Adam Powell
98b40aac83 Merge "Disable ResolverComparator's debug logging" into mnc-dev 2015-06-11 17:14:04 +00:00
Adam Powell
064139434d Disable ResolverComparator's debug logging 
Change-Id: Ic1df5a7caaadf7076436cbcec6e79bb14ffa1c81
 2015-06-11 10:08:03 -07:00
Joe Fernandez
3e634d9358 am fd7a6b03: am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit 'fd7a6b03329606caa4e61eab64435b6407c90bf2':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 16:47:20 +00:00
Joe Fernandez
fd7a6b0332 am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit 'd1d8b843dd4b7575438339a15e610deafa060f76':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 16:33:02 +00:00
Adrian Roos
a6e772c822 Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev 2015-06-11 16:24:38 +00:00