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

196518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
97cb8040ce am 54380c74: Merge "Fix CarrierText airplane mode with no sims" into mnc-dev 
* commit '54380c741bce96a35a5e9df0a8722c3cf5cd4e35':
  Fix CarrierText airplane mode with no sims
 2015-06-11 21:54:12 +00: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
f90437d296 am 06a9fdc4: Merge "A11y: Use a backstop dialog timeout when a11y is enabled." into mnc-dev 
* commit '06a9fdc4ea38dfcc8232e498f86446edc88d3726':
  A11y: Use a backstop dialog timeout when a11y is enabled.
 2015-06-11 20:45:48 +00:00
Ruben Brunk
49f64f2e0a am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev 
* commit 'c2b409267e1d9b99d4357d566291fcb9a2e88464':
  Fix intermediate preview size selection for legacy.
 2015-06-11 20:36:33 +00:00
Yin-Chia Yeh
990c85d0c2 am dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 
* commit 'dba1cf3d515b382e997a5a0e50b50215e3f65f9e':
  Camera2: Legacy: handle FPS range properly
 2015-06-11 20:36:29 +00:00
Chris Craik
c4f8e6d5ed am 1b83edc6: Merge "Workaround shader crash" into mnc-dev 
* commit '1b83edc6160d18323c7a0e0b892e97c05914ff81':
  Workaround shader crash
 2015-06-11 20:36:24 +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
Amit Mahajan
486d4283b2 am 02184244: Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev 
* commit '02184244dcd0149252676bbf24c6d9a5c9ebfd5b':
  Change to add STK_PERMISSION for stk related commands.
 2015-06-11 20:30:17 +00:00
Zheng Fu
cc7d826c91 am dfd93c69: Merge "Revert contact metadata_sync constants." into mnc-dev 
* commit 'dfd93c69c08bf0bd0c7a631b27c50a51096c9727':
  Revert contact metadata_sync constants.
 2015-06-11 20:30:13 +00:00
Adam Lesinski
6643da9557 am df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 
* commit 'df85c12ba5eaa81a064eb8a837f3d2e8a110a3c8':
  Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
 2015-06-11 20:30:08 +00:00
Roozbeh Pournader
45bf88e953 am 51dd6a16: Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev 
* commit '51dd6a16f7891c40b45dff66174a0374d54e680a':
  Merge EXTENDED font profile with the next (unnamed) profile.
 2015-06-11 20:30:04 +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
Jason Monk
88bc1871f4 am 00a34ab5: Merge "Protect against null detail record." into mnc-dev 
* commit '00a34ab54c0e53461586c9596b4f43615319329f':
  Protect against null detail record.
 2015-06-11 20:12:09 +00:00
Carlos Valdivia
9c9ebccd02 am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit 'd0041e5f474f4e795d6bc9e5eeaec4098949897c':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 20:12:04 +00: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
Jeff Sharkey
a6f89a07f1 am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'c8488e99e85ae5252e6078c00d123f1364aef25d':
  Ignore some more generic USB device names.
 2015-06-11 20:05:38 +00:00
Carlos Valdivia
d0041e5f47 Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 2015-06-11 20:04:44 +00: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
Chris Craik
31f5083835 am e22c59b2: Trace each stage of Choreographer driven frames 
* commit 'e22c59b2913578c24e86673576d009d34306f6be':
  Trace each stage of Choreographer driven frames
 2015-06-11 19:59:34 +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
Makoto Onuki
cc0c8a4842 am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'bf2ccf9455619ac8593319cf5814f2c665656c5e':
  Fix the PFD detachFd issue.
 2015-06-11 19:53:43 +00:00
Eino-Ville Talvala
e411274447 am cd17a84a: Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev 
* commit 'cd17a84a860769049806c8a7fe80d274edcd950d':
  Add more specific consumer names for common buffer queue endpoints.
 2015-06-11 19:53:36 +00: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
cd6759e4ef am db6ac98e: Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885" into mnc-dev 
* commit 'db6ac98ec375f388d4815fe405201e9649a003f8':
  DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885
 2015-06-11 19:01:05 +00: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
415cc61096 am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '8a26514687ccf651eb73d5acdd3ae7c62d247d97':
  Selected count string needs plurals.
 2015-06-11 18:27:55 +00:00
Carlos Valdivia
e262829d0c am ffb46022: Permissions: Fix account related permissions. 
* commit 'ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814':
  Permissions: Fix account related permissions.
 2015-06-11 18:22:59 +00: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
6776c33808 am cbf63d8a: am 405d58ff: am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit 'cbf63d8abab1980d290d02e2d5ebdd7e1d70298f':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 18:05:06 +00:00
Hyungtae Tim Kim
8604a1af70 am d15e2c62: Merge "Add bucket that unknown state playback falls into" into mnc-dev 
* commit 'd15e2c62e8cf6634376326fc35ad28829c5fc109':
  Add bucket that unknown state playback falls into
 2015-06-11 18:05:01 +00: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
Craig Lafayette
7ff09f2be0 am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev 
* commit '77b2d49abb38fafb91fb99ce603a92f189553cd7':
  Remove device initializer status messages
 2015-06-11 17:56:00 +00:00