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

49387 Commits

Author SHA1 Message Date
Andrei Stingaceanu
0258e42f6b Merge "Completely remove ExtractActionMode - master cherrypick" 2015-06-11 14:20:05 +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
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
Jeff Brown
67e56c1039 am 04eeeaaf: am 468353e3: am 3c9614a0: Merge "Expose Context.getSystemServiceName()." into mnc-dev 
* commit '04eeeaafb9d9a7cbd9cc2cc73dd64a814fb9a57c':
  Expose Context.getSystemServiceName().
 2015-06-11 05:55:31 +00:00
Jeff Brown
eb29daab8b am e0c4fb5c: am 26df10b9: am 5b65a36d: Merge "Add docs for ContentProviderOperations." into mnc-dev 
* commit 'e0c4fb5cfc872bf0912985b49a579bfa7b25adff':
  Add docs for ContentProviderOperations.
 2015-06-11 05:55:25 +00:00
Robert Greenwalt
de4c947aef am c2a3f75f: am 1ec7d05e: am 3cbad5c1: Merge "Remove network requests properly." into mnc-dev 
* commit 'c2a3f75fb60a4a720f07791cfe0730f42cd8eb80':
  Remove network requests properly.
 2015-06-11 05:55:20 +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
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
Jonathan Basseri
f3ee1f15c3 am f025df1c: am f823a7f7: am 95120bbb: Merge "Fix typo possibly -> possible." into mnc-dev 
* commit 'f025df1c1c0b2cd90ba19404b50a26183531ebd8':
  Fix typo possibly -> possible.
 2015-06-11 02:34:52 +00:00
Jeff Sharkey
9c9661f1b7 am 51b055d3: am e1844c83: am 5fc24733: New strings! 
* commit '51b055d330279f5d0a38ad1c33540189e71356e8':
  New strings!
 2015-06-11 02:34:28 +00:00
Aravind Akella
86e45e626b am b05c4821: am 1c2cf214: am 0d07846f: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 
* commit 'b05c48212220248a66dccac43405cad0f9b75ff3':
  Use LOCATION_HARDWARE permission for data injection.
 2015-06-11 02:33:25 +00:00
Zhijun He
704f119bb3 am 61cc1ee3: am cee46cfe: am 1527edbc: Merge "Camera2: fix high speed output surface format check" into mnc-dev 
* commit '61cc1ee35abdcd2a597e99842fd87a1385bcf19d':
  Camera2: fix high speed output surface format check
 2015-06-11 02:33:15 +00:00
Raph Levien
c2ff9ad8fc am 9f7b2008: am 3354ac51: am a011c7fc: Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 
* commit '9f7b20083ad5281e649e0abd17479f2db8cd93da':
  Fix documentation of nextSpanTransition off by one
 2015-06-11 02:33:04 +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
Vladislav Kaznacheev
89210027d9 am 99eae978: am 093aba01: am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev 
* commit '99eae97826b89f7625652d3fd77ace53c11361f6':
  Make VPA.setInterpolator(null) unset the interpolator.
 2015-06-11 01:33:06 +00:00
Alan Viverette
65875f1199 am a32fdbda: am 7654bffd: am 2964c7b8: Merge "Update seek bar dialog preference for Material" into mnc-dev 
* commit 'a32fdbda3313dd8c6d8ca257c739fa296c4fdfb7':
  Update seek bar dialog preference for Material
 2015-06-11 01:32:39 +00:00
Jun Mukai
abc99c1c71 am f3de2803: am ea26da24: am b3aa575e: Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 
* commit 'f3de280367f77e6e5b03dca18df42d1ed79ee467':
  Specifies the new height/width for update() on ListPopupWindow.show().
 2015-06-11 01:32:12 +00:00
Nick Kralevich
1382a6e0dc am a5a14350: am 6d215c30: am 5ac4a5fa: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit 'a5a14350d09e2d08aecc359e3233b8816ab325f4':
  Fix USB access control when adb is disabled.
 2015-06-11 01:32:05 +00:00
Adam Lesinski
b39a20e8df am 5b02907c: am 9702b5d9: am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 
* commit '5b02907c9779028cbc60db153fa5f0819155680b':
  Add more blaming output to batterystats dumpsys
 2015-06-11 01:31:46 +00:00
Jason Monk
ceebac31ce am 4ef0beb6: am 5bda8f4e: am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev 
* commit '4ef0beb6ae3a7671845454b833d7046fcb23283e':
  Add action for reaching ignore battery optimizations
 2015-06-11 01:31:39 +00:00
Robin Lee
14bbf5adf0 am d5c99db4: am 347836e9: am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 
* commit 'd5c99db4594010384e519a9b3f5f7ceafbe5ba80':
  Policy: make bulk CA uninstalls happen in service
 2015-06-11 01:31:33 +00:00
Jeff Brown
6896c122ed am a748bfbd: am 9749e335: am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev 
* commit 'a748bfbd6e7f3aec4cac4c2130346350d4fcda1e':
  Support 4K overlay displays.
 2015-06-11 01:31:21 +00:00
Ben Kwa
cf1e2f03df resolved conflicts for merge of 3aff4fc6 to master 
Change-Id: Id816d859f929de3bd0328ef3a67e2bef9fadf28b
 2015-06-10 18:22:10 -07: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
Alan Viverette
a32fdbda33 am 7654bffd: am 2964c7b8: Merge "Update seek bar dialog preference for Material" into mnc-dev 
* commit '7654bffd6a4015e3ad41340607b71b50e746825f':
  Update seek bar dialog preference for Material
 2015-06-10 23:16:46 +00:00
Jun Mukai
f3de280367 am ea26da24: am b3aa575e: Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 
* commit 'ea26da244efe4757ec01fc30980d6f1c5047bffa':
  Specifies the new height/width for update() on ListPopupWindow.show().
 2015-06-10 23:16:16 +00:00
Nick Kralevich
a5a14350d0 am 6d215c30: am 5ac4a5fa: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit '6d215c300ffccd2ab5b4e4403d67c40cbd64c01a':
  Fix USB access control when adb is disabled.
 2015-06-10 23:16:08 +00:00
Adam Lesinski
5b02907c97 am 9702b5d9: am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 
* commit '9702b5d98824df4fafce821ce9fe15907586b9b1':
  Add more blaming output to batterystats dumpsys
 2015-06-10 23:15:25 +00:00
Jason Monk
4ef0beb6ae am 5bda8f4e: am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev 
* commit '5bda8f4e2436582e17307f35326376db7cb28657':
  Add action for reaching ignore battery optimizations
 2015-06-10 23:15:19 +00:00
Robin Lee
d5c99db459 am 347836e9: am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 
* commit '347836e965dd5c88b1a679d27e7a66f6858a7e3e':
  Policy: make bulk CA uninstalls happen in service
 2015-06-10 23:15:04 +00:00
Jeff Brown
a748bfbd6e am 9749e335: am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev 
* commit '9749e33579a3d27144ac39d9e3572ed30e234039':
  Support 4K overlay displays.
 2015-06-10 23:14:36 +00:00
Ben Kwa
3aff4fc621 am e04b20dd: am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 
* commit 'e04b20dd763a212596a3a77ca342fe4fb33e2939':
  Enable apps to exclude their own roots from the DocumentsUI roots list.
 2015-06-10 23:13:30 +00: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