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

196607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Yohei Yukawa
5c31de33cc Keyboard.Key#onReleased() should handle inside parameter. 
The boolean parameter of Keyboard.Key#onReleased(boolean) has
been somehow ignored since Capcake.  With this CL, that method
starts working as documented.

Alternatively we could fix the issue when and only when the
application's targetSdkVersion >= 23.  We didn't do that because:
- Although Keyboard.Key class is a public API, it is supposed to
  be used almost only by android.inputmethodservice.KeyboardView.
  The risk of unwanted compatibility problems is low.
- Fixing that is beneficial for users because it actually fixes
  UX issue when applications/IMEs that still rely on KeyboardView
  run in Android M.
- All the fields that are related to Keyboard.Key#onReleased are
  public fields so developers can easily work around anyway.

Bug: 21446448
Change-Id: I392166c77cd9dd2c432dc4f1274312f8355de02b
 2015-06-11 11:45:34 -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
Alex Klyubin
4b667347f2 am 96d7058a: Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev 
* commit '96d7058aaaf58a0c6a2bfb296c5950b2e7e37d37':
  Android Keystore keys are no longer backed by Conscrypt.
 2015-06-11 17:55:54 +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
5c3f408c29 am 98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev 
* commit '98b40aac8399d8befc5099955a34ce54df477d8f':
  Disable ResolverComparator's debug logging
 2015-06-11 17:26:50 +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
81d7317a1b am 3e634d93: am fd7a6b03: am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit '3e634d93587d06d1dddfbe0b409891b39b92daa6':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 17:01:51 +00: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
8c9a57fbce am a6e772c8: Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev 
* commit 'a6e772c822b9095898b6611df0bedf95f445ca6e':
  Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497
 2015-06-11 16:26:45 +00:00
Adrian Roos
7bb85323cd am 5b56be60: Merge "Filter hover events for clipped views" into mnc-dev 
* commit '5b56be608942e61a5e3e0e625f4c032f9ed39808':
  Filter hover events for clipped views
 2015-06-11 16:26:41 +00:00
Benjamin Franz
8b5c2e8acd am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev 
* commit 'd168d184c02c33863b4eda56fae431437f609e2c':
  Align the behaviour of different lock task modes
 2015-06-11 16:26:36 +00:00
Adrian Roos
a6e772c822 Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev 2015-06-11 16:24:38 +00:00
Joe Fernandez
d1d8b843dd Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 2015-06-11 16:24:26 +00:00
Adrian Roos
5b56be6089 Merge "Filter hover events for clipped views" into mnc-dev 2015-06-11 16:24:11 +00:00
Jeff Sharkey
f491c72e4a Selected count string needs plurals. 
Bug: 21717427
Change-Id: Ie0db8ac30244b022ca5838969fb085230bfc4499
 2015-06-11 09:19:37 -07:00
Benjamin Franz
d168d184c0 Merge "Align the behaviour of different lock task modes" into mnc-dev 2015-06-11 16:15:37 +00:00