Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,491 Commits 3 Branches 0 Tags
2f318dd7310ea38e50f76b668a3116f7ea0c74d1
Commit Graph

48746 Commits

Author SHA1 Message Date
Benjamin Franz
12f73c3b03 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 17:56:07 +00: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
ef24170ddb am c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 
* commit 'c110887c2ad9de1de5154ac67740c6a0860fa016':
  Volume: Disable seekbar prefs when zen muted.
 2015-06-11 15:59:05 +00:00
Svet Ganov
1216ce6a72 am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit '5772b5c671a13d9c4bbc1e3803667166f811cb33':
  Propagete document meta-data to custom print UI.
 2015-06-11 15:58:38 +00:00
Svet Ganov
20a6f9866f am e545bd36: Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 
* commit 'e545bd36a483b51ef681ea063f7bda9352adb4d4':
  Permission group is granted if one permission is granted for UI purposes.
 2015-06-11 15:58:33 +00:00
Chris Banes
bf82d7c198 am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit 'dbdaa9b41e418437ec29f7ea2fa27b859b3bef14':
  API council review feedback for ActionMenuView
 2015-06-11 15:58:21 +00:00
Svetoslav
235429f652 am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '75a0ee081fa31b75649e164a8bf79a23a3ebd060':
  Add system API to watch for permission changes
 2015-06-11 15:58:00 +00:00
Robert Greenwalt
6917d2e943 am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev 
* commit 'c34f2f15df2030bc8c4865210da3bcbba46116bb':
  Add logging to help debug this issue.
 2015-06-11 15:57:36 +00:00
Jeff Brown
f56be2d139 am 3c9614a0: Merge "Expose Context.getSystemServiceName()." into mnc-dev 
* commit '3c9614a03a40c3590b38eed71f86c24d81c6d52a':
  Expose Context.getSystemServiceName().
 2015-06-11 15:56:34 +00:00
Jeff Brown
6ae596f59b am 5b65a36d: Merge "Add docs for ContentProviderOperations." into mnc-dev 
* commit '5b65a36d59a5ca09dc12c22c8b2f8dc50e3b4fbb':
  Add docs for ContentProviderOperations.
 2015-06-11 15:56:28 +00:00
Robert Greenwalt
c8d5aa18af am 3cbad5c1: Merge "Remove network requests properly." into mnc-dev 
* commit '3cbad5c17f8f8312f5e87e528f6094b60fddc440':
  Remove network requests properly.
 2015-06-11 15:56:23 +00:00
Jonathan Basseri
a01bd2db3a am 95120bbb: Merge "Fix typo possibly -> possible." into mnc-dev 
* commit '95120bbb6fb8d36d52e32d6d8d5435fc92318ca7':
  Fix typo possibly -> possible.
 2015-06-11 15:55:04 +00:00
Jeff Sharkey
961e86e691 am 5fc24733: New strings! 
* commit '5fc247338dfc1a817f708163201cdf395cff3303':
  New strings!
 2015-06-11 15:54:03 +00:00
Aravind Akella
b260a72925 am 0d07846f: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 
* commit '0d07846f0f111bc7afa5a153aa67a12022263a38':
  Use LOCATION_HARDWARE permission for data injection.
 2015-06-11 15:52:01 +00:00
Zhijun He
c738cdce45 am 1527edbc: Merge "Camera2: fix high speed output surface format check" into mnc-dev 
* commit '1527edbcf93bac258d384da3d0007c810856ea4e':
  Camera2: fix high speed output surface format check
 2015-06-11 15:51:49 +00:00
Raph Levien
31e61ba355 am a011c7fc: Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 
* commit 'a011c7fcf750e25038eb5862f41e883fef1f54f7':
  Fix documentation of nextSpanTransition off by one
 2015-06-11 15:51:38 +00:00
Vladislav Kaznacheev
57b3ff3ce3 am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev 
* commit '1955ee57b3210d9027e1c46731cf1f44406166da':
  Make VPA.setInterpolator(null) unset the interpolator.
 2015-06-11 15:42:31 +00:00
Alan Viverette
c7e86be82d am 2964c7b8: Merge "Update seek bar dialog preference for Material" into mnc-dev 
* commit '2964c7b8af15571e2967622eac0161c065880b3c':
  Update seek bar dialog preference for Material
 2015-06-11 15:41:11 +00:00
Jun Mukai
a9d1aff2a5 am b3aa575e: Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 
* commit 'b3aa575e3b8ec8f685c7431259f49ad82f2ee928':
  Specifies the new height/width for update() on ListPopupWindow.show().
 2015-06-11 15:40:44 +00:00
Nick Kralevich
3e14e33235 am 5ac4a5fa: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit '5ac4a5fa38fe1bea0007235840fb77ba3648a1d3':
  Fix USB access control when adb is disabled.
 2015-06-11 15:40:39 +00:00
Adam Lesinski
7ed56c46f6 am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 
* commit '3d53a26d1a8471f4709b528686601381fd7e6da4':
  Add more blaming output to batterystats dumpsys
 2015-06-11 15:39:48 +00:00
Jason Monk
0a2f637531 am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev 
* commit '253ee76dd9da2cda043d113f247b3c8acf915d77':
  Add action for reaching ignore battery optimizations
 2015-06-11 15:39:43 +00:00
Robin Lee
5b69aefb1b am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 
* commit '8bbbcd3d5402285b05db64c3ffd3a959f26ad16c':
  Policy: make bulk CA uninstalls happen in service
 2015-06-11 15:39:33 +00:00
Jeff Brown
38fc805459 am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev 
* commit '4bc5054040c84e5d0e97357a30faab30ce4c5441':
  Support 4K overlay displays.
 2015-06-11 15:39:09 +00:00
Ben Kwa
2d5c9c368e am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 
* commit 'c783a5e762b0c4925756b8ca273eb26aab5e7985':
  Enable apps to exclude their own roots from the DocumentsUI roots list.
 2015-06-11 15:38:09 +00:00
John Reck
a23a87f7cd am 767ec843: Merge "Set the right reportNextDraw" into mnc-dev 
* commit '767ec84354d97624b2b848c8a0b8877d87ebb5eb':
  Set the right reportNextDraw
 2015-06-11 14:53:11 +00:00
Dan Sandler
b26c1dc4ff am 382225af: Merge "Null check when reconstituting legacy icon data." into mnc-dev 
* commit '382225af479964a1677a76fe8d8f69d577ddb912':
  Null check when reconstituting legacy icon data.
 2015-06-11 14:53:04 +00:00
Chien-Yu Chen
1ab3219d5e am a3a0ea3b: Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 
* commit 'a3a0ea3b1b75024af23eac8ec767d2299373664a':
  Camera2: Clarify capture order for reprocess
 2015-06-11 14:52:44 +00:00
Clara Bayarri
23fb9209b0 am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit '89124000c618f24b948505cd79f654aacbdff957':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-11 14:51:32 +00:00
Makoto Onuki
d832b1ae9d am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'e6d8ffb40f555bbb3b88a3544616de28426e75a1':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-11 14:51:03 +00:00
Keisuke Kuroyanagi
a4f8893e43 am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit '136a462c8bb35bdd21258f03f3f9adca06990701':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-11 14:50:13 +00:00
Chet Haase
7bd942469d am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit '81728b862e8448bc460fd6589de6c1b954f8227e':
  Clarify docs for Animator.isStarted()
 2015-06-11 14:49:49 +00:00
Andrew Flynn
64af0511ca am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-11 14:48:29 +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
a6a63328b0 resolved conflicts for merge of 1c96a941 to mnc-vt-dev 
Change-Id: I054ad8a72daa609138954909619ef6270062baaf
 2015-06-11 12:08:49 +01: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
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
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
John Spurlock
96d4a9ec39 Volume: Disable seekbar prefs when zen muted. 
- And display the last audible value.

Bug: 21267436
Change-Id: I667d0680811b48a51eab22c837933e493f1d5c44
 2015-06-10 19:04:40 -04:00