Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,430 Commits 3 Branches 0 Tags
f68b581cb0687fb1b40258ea526d1154df311bee
Commit Graph

48867 Commits

Author SHA1 Message Date
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
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
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
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
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +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
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
John Spurlock
c110887c2a Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 2015-06-11 14:08:48 +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
Svetoslav
47db722168 am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '0525c07f30f08008883cf2845afa3bf81f888c55':
  Add system API to watch for permission changes
 2015-06-11 12:53:42 +00:00
Robert Greenwalt
0c3b280af0 am ac114ae0: am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev 
* commit 'ac114ae071fac3693e4694f338f5e5612f11a730':
  Add logging to help debug this issue.
 2015-06-11 12:53:16 +00:00
Svet Ganov
5772b5c671 Propagete document meta-data to custom print UI. 
Change-Id: I3f122224e1b311a222969253ae0336177989a414
 2015-06-11 03:32:09 -07:00
Svet Ganov
e545bd36a4 Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 2015-06-11 08:17:43 +00:00
Svet Ganov
1ed0e553c6 Permission group is granted if one permission is granted for UI purposes. 
bug:21761217

Change-Id: I02c78225e3883106565d304d5b268e496bca7d89
 2015-06-11 01:17:07 -07:00
Chris Banes
dbdaa9b41e Merge "API council review feedback for ActionMenuView" into mnc-dev 2015-06-11 08:05:42 +00:00
Svetoslav
75a0ee081f Merge "Add system API to watch for permission changes" into mnc-dev 2015-06-11 08:02:06 +00:00
Robert Greenwalt
3d68dee119 Add logging to help debug this issue. 
Shows:
TelephonyNetworkFactories:
    {TelephonyNetworkFactory - ScoreFilter=50, Filter=[ Transports:
    CELLULAR Capabilities: MMS&SUPL&DUN&FOTA&IMS&CBS&IA&RCS&XCAP&EIMS&
    INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN Specifier: <2>],
    requests=1, refCount=0}
        {NetworkRequest [ id=1, legacyType=-1, [ Capabilities:
        INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN] ], score=50, requested=true}

bug:20731384
Change-Id: I6a38f195609ad01ff2a2584d07945540ae421586
 2015-06-10 22:17:49 -07:00
Svetoslav
f7c06eb03a Add system API to watch for permission changes 
Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
 2015-06-10 21:24:13 -07:00
Jeff Brown
04eeeaafb9 am 468353e3: am 3c9614a0: Merge "Expose Context.getSystemServiceName()." into mnc-dev 
* commit '468353e3229a4f3895e4ad6c09959b1d0f942e49':
  Expose Context.getSystemServiceName().
 2015-06-11 03:01:19 +00:00
Jeff Brown
e0c4fb5cfc am 26df10b9: am 5b65a36d: Merge "Add docs for ContentProviderOperations." into mnc-dev 
* commit '26df10b99716b067f451b9fe5a0a74bf6a400d41':
  Add docs for ContentProviderOperations.
 2015-06-11 03:01:13 +00:00
Robert Greenwalt
c2a3f75fb6 am 1ec7d05e: am 3cbad5c1: Merge "Remove network requests properly." into mnc-dev 
* commit '1ec7d05eec4404a14ae2838fe12352debcccea4f':
  Remove network requests properly.
 2015-06-11 02:54:29 +00:00
Jeff Brown
3c9614a03a Merge "Expose Context.getSystemServiceName()." into mnc-dev 2015-06-11 02:37:29 +00:00
Jeff Brown
5b65a36d59 Merge "Add docs for ContentProviderOperations." into mnc-dev 2015-06-11 02:32:13 +00:00
Robert Greenwalt
3cbad5c17f Merge "Remove network requests properly." into mnc-dev 2015-06-11 02:19:17 +00:00
Jonathan Basseri
f025df1c1c am f823a7f7: am 95120bbb: Merge "Fix typo possibly -> possible." into mnc-dev 
* commit 'f823a7f7d41c5f56e638435cf59c2ebb8e05cc57':
  Fix typo possibly -> possible.
 2015-06-11 01:51:31 +00:00
Jeff Sharkey
51b055d330 am e1844c83: am 5fc24733: New strings! 
* commit 'e1844c8302c57e231b85b2fb3cb59fb7f569a270':
  New strings!
 2015-06-11 01:51:09 +00:00
Aravind Akella
b05c482122 am 1c2cf214: am 0d07846f: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 
* commit '1c2cf214eec147ca1635bdfd4d837e1293b73003':
  Use LOCATION_HARDWARE permission for data injection.
 2015-06-11 01:50:13 +00:00
Zhijun He
61cc1ee35a am cee46cfe: am 1527edbc: Merge "Camera2: fix high speed output surface format check" into mnc-dev 
* commit 'cee46cfe16f786e852708df717847d3ecc41a195':
  Camera2: fix high speed output surface format check
 2015-06-11 01:50:07 +00:00
Raph Levien
9f7b20083a am 3354ac51: am a011c7fc: Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 
* commit '3354ac51fce160274680ecb4e9af0d7e9cf3977e':
  Fix documentation of nextSpanTransition off by one
 2015-06-11 01:49:56 +00:00
Jeff Brown
40f58d910a Expose Context.getSystemServiceName(). 
Expose this method so that subclasses can declare new types of services
that can be returned by getSystemService(Class<T>).

Bug: 21343770
Change-Id: I08bdfa61153d19298645dc495deb2d535e54f9f0
 2015-06-10 17:47:52 -07:00
Jonathan Basseri
95120bbb6f Merge "Fix typo possibly -> possible." into mnc-dev 2015-06-11 00:44:46 +00:00
Jeff Brown
764e95ec4f Add docs for ContentProviderOperations. 
Bug: 21343769
Change-Id: Ia122b58785cf98f16664f82eb00a1f6bd9366885
 2015-06-10 17:39:29 -07:00
Jeff Sharkey
5fc247338d New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
 2015-06-10 16:49:11 -07:00
Vladislav Kaznacheev
99eae97826 am 093aba01: am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev 
* commit '093aba013fd56b56f272940e268dee2070b9173f':
  Make VPA.setInterpolator(null) unset the interpolator.
 2015-06-10 23:17:42 +00:00