Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,449 Commits 3 Branches 0 Tags
6b4450bcf8ca2a7fddc3dfe4ecfd2fddad04bcf9
Commit Graph

53874 Commits

Author SHA1 Message Date
Carlos Valdivia
6b4450bcf8 am f68b581c: am 9c9ebccd: am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit 'f68b581cb0687fb1b40258ea526d1154df311bee':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 21:24:44 +00:00
Jeff Sharkey
4d98bd0e3a am 03d3aefd: am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit '03d3aefd3e0cc1b1cd1f43792ab9c3fc3bc9614c':
  Ignore some more generic USB device names.
 2015-06-11 21:24:39 +00:00
Carlos Valdivia
f68b581cb0 am 9c9ebccd: am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit '9c9ebccd028fecafaf36660351ce598b7ff8106c':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 21:10:55 +00:00
Jeff Sharkey
03d3aefd3e am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'a6f89a07f191c8f80d7cbce62b178f8bdc23ec18':
  Ignore some more generic USB device names.
 2015-06-11 21:10:50 +00:00
Chris Craik
68278f8420 am 15167d15: am 31f50838: am e22c59b2: Trace each stage of Choreographer driven frames 
* commit '15167d15b493e54c5ccc8697256142815132cec0':
  Trace each stage of Choreographer driven frames
 2015-06-11 20:25:44 +00:00
Makoto Onuki
3a2255e957 am ed5d2dc2: am cc0c8a48: am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'ed5d2dc274e4a4b47816086653bf2d753c5ca115':
  Fix the PFD detachFd issue.
 2015-06-11 20:25:38 +00:00
Chris Craik
15167d15b4 am 31f50838: am e22c59b2: Trace each stage of Choreographer driven frames 
* commit '31f50838357f8017721ba198c2cf6ddb733c378f':
  Trace each stage of Choreographer driven frames
 2015-06-11 20:05:33 +00:00
Makoto Onuki
ed5d2dc274 am cc0c8a48: am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'cc0c8a48422e0bb5a1f699fdb12d12691004fe7c':
  Fix the PFD detachFd issue.
 2015-06-11 20:05:28 +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 ffb46022b3.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
 2015-06-11 20:04:04 +00: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
Makoto Onuki
b30ad6f5e8 Fix the PFD detachFd issue. 
Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703
 2015-06-11 12:34:22 -07:00
Jeff Sharkey
7f9cbf94f4 am 2656fa06: am 415cc610: am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '2656fa065f820873695ba7743ad0a2ff7d913567':
  Selected count string needs plurals.
 2015-06-11 18:47:58 +00:00
Carlos Valdivia
afd71a8fb6 am 2e2d22a2: am e262829d: am ffb46022: Permissions: Fix account related permissions. 
* commit '2e2d22a20e7eb8216fa299a1b9b4f8ef98078021':
  Permissions: Fix account related permissions.
 2015-06-11 18:47:52 +00:00
Jeff Sharkey
2656fa065f am 415cc610: am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '415cc61096e8198e005b42a1172f103016dfc3fc':
  Selected count string needs plurals.
 2015-06-11 18:35:48 +00:00
Carlos Valdivia
2e2d22a20e am e262829d: am ffb46022: Permissions: Fix account related permissions. 
* commit 'e262829d0cb2e8117a18bc5b397daa17316acd46':
  Permissions: Fix account related permissions.
 2015-06-11 18:35:43 +00:00
Craig Lafayette
2e8beb5d40 am 6c5acdbc: am 7ff09f2b: am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev 
* commit '6c5acdbc938bc9ee989fb36b8ace7f91b3bfbc1b':
  Remove device initializer status messages
 2015-06-11 18:23:59 +00:00
Jeff Sharkey
8a26514687 Merge "Selected count string needs plurals." into mnc-dev 2015-06-11 18:21:08 +00:00
Craig Lafayette
6c5acdbc93 am 7ff09f2b: am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev 
* commit '7ff09f2be0be1ad5f9c7b9dce31084522fb30608':
  Remove device initializer status messages
 2015-06-11 18:08:58 +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
Adam Powell
5827415c81 am 8a22c78c: am 5c3f408c: am 98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev 
* commit '8a22c78cd1bc1613500e46b9f4219840f910d68a':
  Disable ResolverComparator's debug logging
 2015-06-11 17:55:10 +00:00
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Adam Powell
8a22c78cd1 am 5c3f408c: am 98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev 
* commit '5c3f408c29451c2dff45d9d5edc4534d239d8700':
  Disable ResolverComparator's debug logging
 2015-06-11 17:40:18 +00:00
Andrei Stingaceanu
6b817692d1 Merge "Remove ExtractEditAction - part 1" 2015-06-11 17:37:42 +00:00
Andrei Stingaceanu
710645eb36 Remove ExtractEditAction - part 1 
Use the floating toolbar action mode instead.
This change is identical to 7315b15a034eeb2d9a4cd24c100023c048ca
(minus string changes). Due to scary conflicts in strings I will
make the string changes in the next CL.

Change-Id: Ia66ef5e886df1fc42a8e1ba52d77141e1e88dbd4
 2015-06-11 18:35:00 +01:00
Adam Powell
98b40aac83 Merge "Disable ResolverComparator's debug logging" into mnc-dev 2015-06-11 17:14:04 +00:00
Benjamin Franz
a7e5c589c6 am 95b555fc: am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev 
* commit '95b555fc90bcf73723aaee7757fc5aafd84adec4':
  Align the behaviour of different lock task modes
 2015-06-11 17:09:11 +00:00
John Spurlock
ead1e5c6ac am 2fd86477: am a03c1050: am c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 
* commit '2fd86477b1dfad6d3a719067e6c875c140bb1537':
  Volume: Disable seekbar prefs when zen muted.
 2015-06-11 17:08:36 +00:00
Adam Powell
064139434d Disable ResolverComparator's debug logging 
Change-Id: Ic1df5a7caaadf7076436cbcec6e79bb14ffa1c81
 2015-06-11 10:08:03 -07:00
Svet Ganov
28a8ff2feb am 72c9e509: am f3dbed08: am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit '72c9e50908a9d50775be0a966735ecf1041b0690':
  Propagete document meta-data to custom print UI.
 2015-06-11 17:07:28 +00:00
Svet Ganov
3ea645906b am 392b8e01: am 4794e300: am e545bd36: Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 
* commit '392b8e015490029427929bbc370dc02e947e6b9e':
  Permission group is granted if one permission is granted for UI purposes.
 2015-06-11 17:07:23 +00:00
Chris Banes
2997afda56 am d4e6479e: am 0d4798be: am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit 'd4e6479ef72202f28fc306988b91f777300ee6d9':
  API council review feedback for ActionMenuView
 2015-06-11 17:07:11 +00:00
Svetoslav
3c0e6d9ebf am 47db7221: am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '47db7221685aaa12926abc42198069c733491cfc':
  Add system API to watch for permission changes
 2015-06-11 17:07:05 +00:00
Benjamin Franz
95b555fc90 am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev 
* commit '8b5c2e8acd01c87204ba0b842a35c625be174e5b':
  Align the behaviour of different lock task modes
 2015-06-11 16:38:36 +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
Steve Paik
b8850932d7 Merge "Disable AssetAtlasService when PRELOAD_RESOURCES is turned off" 2015-06-11 15:30:03 +00:00
Andrei Stingaceanu
02ec21380f Merge "Revert "Completely remove ExtractActionMode - master cherrypick"" 2015-06-11 14:36:31 +00:00
Andrei Stingaceanu
1036c74784 Revert "Completely remove ExtractActionMode - master cherrypick" 
This reverts commit 00245473db.

Change-Id: If078c09fbdfd00d005ff58d543f03601b96eef0a
 2015-06-11 14:34:50 +00:00
John Spurlock
2fd86477b1 am a03c1050: am c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 
* commit 'a03c1050e46a4bab2f1e532d295ab269e98471ac':
  Volume: Disable seekbar prefs when zen muted.
 2015-06-11 14:23:44 +00:00
Andrei Stingaceanu
0258e42f6b Merge "Completely remove ExtractActionMode - master cherrypick" 2015-06-11 14:20:05 +00:00
John Spurlock
c110887c2a Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 2015-06-11 14:08:48 +00:00
Andrei Stingaceanu
00245473db Completely remove ExtractActionMode - master cherrypick 
Use the floating toolbar action mode instead.
This CL is identical to ag/701639. The merge to master was skipped
due to a conflict. This is the 'manual merge'

Bug: 20128047
Change-Id: I5ef9b4b5b9574a4a360a853b2d1abd5b374f2fd5
 2015-06-11 14:43:41 +01:00
Robert Greenwalt
7cbf1af20d am 0c3b280a: am ac114ae0: am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev 
* commit '0c3b280af0e655c4e26fc0974787a30e1fe063d8':
  Add logging to help debug this issue.
 2015-06-11 13:02:19 +00:00
Svet Ganov
72c9e50908 am f3dbed08: am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit 'f3dbed08df13859dee3c4b000646542c9d867615':
  Propagete document meta-data to custom print UI.
 2015-06-11 12:54:05 +00:00
Svet Ganov
392b8e0154 am 4794e300: am e545bd36: Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 
* commit '4794e3001f6a53515178d5f8069d2e0e09a87285':
  Permission group is granted if one permission is granted for UI purposes.
 2015-06-11 12:54:00 +00:00
Chris Banes
d4e6479ef7 am 0d4798be: am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit '0d4798beb9891d806c29ef8c259790bd7e9c10b6':
  API council review feedback for ActionMenuView
 2015-06-11 12:53:48 +00:00