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

48727 Commits

Author SHA1 Message Date
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
Andrei Stingaceanu
a6a63328b0 resolved conflicts for merge of 1c96a941 to mnc-vt-dev 
Change-Id: I054ad8a72daa609138954909619ef6270062baaf
 2015-06-11 12:08:49 +01: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
Aravind Akella
0d07846f0f Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 2015-06-10 22:56:33 +00:00
Zhijun He
1527edbcf9 Merge "Camera2: fix high speed output surface format check" into mnc-dev 2015-06-10 22:56:22 +00:00
Raph Levien
a011c7fcf7 Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 2015-06-10 22:52:33 +00:00
Aravind Akella
1b41cc9567 Use LOCATION_HARDWARE permission for data injection. 
Change-Id: I59c1e1e97a6a0457f6fc2984b214647814895cf2
 2015-06-10 15:21:03 -07:00
Raph Levien
7d627eb9d2 Fix documentation of nextSpanTransition off by one 
Improve wording of javadoc for nextSpanTransition() to accurately
reflect the actual implementation.

Bug: 19274845
Change-Id: I8f8fb6a21a8cbcc26fefb63164a6943431d16089
 2015-06-10 15:19:50 -07:00
Vladislav Kaznacheev
1955ee57b3 Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev 2015-06-10 21:55:39 +00:00
Robert Greenwalt
348e98dba0 Remove network requests properly. 
We used to only remove requests that we'd acted on but that's
just wrong.

Also adds test case which exposed the problem but passes with the fix.

bug:20731384
Change-Id: I581a005560cc71167b857abf2452769399a9e1b7
 2015-06-10 14:44:34 -07:00
Zhijun He
47ac34997b Camera2: fix high speed output surface format check 
Preview surface default format is not ImageFormat.PRIVATE, the check need to
take this into consideration.

Change-Id: Ib99e64f7781dd15cc5634c66b2d5e5ab2a2d7d6c
 2015-06-10 14:41:57 -07:00
Alan Viverette
2964c7b8af Merge "Update seek bar dialog preference for Material" into mnc-dev 2015-06-10 21:28:32 +00:00
Jun Mukai
b3aa575e3b Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 2015-06-10 21:13:28 +00:00
Nick Kralevich
5ac4a5fa38 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:38 +00:00
Adam Lesinski
3d53a26d1a Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 2015-06-10 20:11:25 +00:00
Adam Lesinski
628ef9cbed Add more blaming output to batterystats dumpsys 
Change-Id: I3216f13f16d89a72617d54638df43ce39183da9e
 2015-06-10 13:08:57 -07:00
Jason Monk
253ee76dd9 Merge "Add action for reaching ignore battery optimizations" into mnc-dev 2015-06-10 20:06:15 +00:00
Robin Lee
8bbbcd3d54 Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 2015-06-10 19:44:18 +00:00
Robin Lee
83881bdbde Policy: make bulk CA uninstalls happen in service 
Fewer round trips, only one point of contact for bugs to creep in.

Bug: 21650477
Change-Id: I1764faa753bd674ecb0d13149d778d99bd2ff4c4
 2015-06-10 19:40:44 +00:00
Jason Monk
287b889f93 Add action for reaching ignore battery optimizations 
Bug: 21375688
Change-Id: I1477192371aae2f3497fd49ad704de183ed836a3
 2015-06-10 15:38:47 -04:00