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

53163 Commits

Author SHA1 Message Date
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
Abodunrinwa Toki
034e5cfca4 am cf068ba2: am 3ae8bf53: Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev 
* commit 'cf068ba27d86289ed085da17a0536a4d3a5208e6':
  Change FloatingToolbar entry/exit animations to fadeIn/fadeOut.
 2015-06-10 23:14:21 +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
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
Jeff Brown
4bc5054040 Merge "Support 4K overlay displays." into mnc-dev 2015-06-10 19:21:13 +00:00
Abodunrinwa Toki
3ae8bf530a Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev 2015-06-10 19:02:17 +00:00
Ben Kwa
c783a5e762 Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 2015-06-10 18:30:31 +00:00
John Reck
f0a79ac935 am 0d8f5352: am 767ec843: Merge "Set the right reportNextDraw" into mnc-dev 
* commit '0d8f53528efb2c5d2e9eeeaaf92fe852082c4b34':
  Set the right reportNextDraw
 2015-06-10 18:28:02 +00:00
Dan Sandler
96beb6babd am 07a07e14: am 382225af: Merge "Null check when reconstituting legacy icon data." into mnc-dev 
* commit '07a07e14972cf3bd2cc2e9ce8ac8fde28e251302':
  Null check when reconstituting legacy icon data.
 2015-06-10 18:27:56 +00:00
Ben Kwa
77797400ec Enable apps to exclude their own roots from the DocumentsUI roots list. 
- Add DocumentsContract.EXTRA_EXCLUDE_SELF (boolean extra)
- Add code to DocumentsActivity to cache the providers of the calling
  app if EXTRA_EXCLUDE_SELF is set on incoming Intents.
- Add code to RootsCache to exclude roots from the calling app.
- Add code to allow only system apps to use EXTRA_PACKAGE_NAME.

Change-Id: Ia7cc2a1a297676c7b26f6e583042a4607d8c9a4e
 2015-06-10 11:24:55 -07:00
Chien-Yu Chen
8a9fa21975 am b1eb5b8f: am a3a0ea3b: Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 
* commit 'b1eb5b8f69ccb25470dcbd14e7854840d67975b7':
  Camera2: Clarify capture order for reprocess
 2015-06-10 18:15:02 +00:00
John Reck
767ec84354 Merge "Set the right reportNextDraw" into mnc-dev 2015-06-10 18:05:03 +00:00
Dan Sandler
382225af47 Merge "Null check when reconstituting legacy icon data." into mnc-dev 2015-06-10 18:03:02 +00:00
Chien-Yu Chen
a3a0ea3b1b Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 2015-06-10 17:51:18 +00:00
Nick Kralevich
674019065b Fix USB access control when adb is disabled. 
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.

As discussed in bug 21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.

To avoid leaking confidential user photos, this change introduces an
unlocked state. Setting the mtp enabled function is now decoupled from
exposing data on the USB connection. Only if MTP is enabled and
USB data has been unlocked is confidential user data allowed to be
shared.

Bug: 21429947
Change-Id: Iefb5c7e22dc4962bf5226f2ed3d0155b5c7b413c
 2015-06-10 10:29:48 -07:00
John Reck
6fa9512e34 Set the right reportNextDraw 
Bug: 8012229

mReportNextDraw is set by resized to have updateWindow() do
its thing. However if we are in updateWindow() and the
relayout() call to WindowManager wants us to report the draw
we should set reportNextDraw instead of mReportNextDraw
so that we report that frame instead of at the accidental next
invalidate.

Change-Id: If6c38d95599469831a0bd5e4d2b3f6c4f259e40c
 2015-06-10 10:25:20 -07:00
Clara Bayarri
0dd41507d5 am dc904377: am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit 'dc904377e7572fbead60d0fa66716de4e92770c2':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:13:53 +00:00
Makoto Onuki
f8d8a6c9b3 am d3acdf2a: am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'd3acdf2a4814c2a476faf444d03887f162235a78':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 16:59:55 +00:00
Clara Bayarri
89124000c6 Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 2015-06-10 16:50:46 +00:00
Makoto Onuki
e6d8ffb40f Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 2015-06-10 16:38:55 +00:00
Keisuke Kuroyanagi
b9a8fc0cbf am b5f1641a: am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit 'b5f1641a34bd70b0758d25a547229234a646c6ef':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-10 15:56:23 +00:00
Keisuke Kuroyanagi
136a462c8b Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 2015-06-10 15:13:16 +00:00
Keisuke Kuroyanagi
eac4556e55 Revert "Fix: Crash when modifying text while using drag accelerator." 
This reverts commit 259292ff3d.

This introduced another bug (Bug: 21687602) and this is no longer useful
for the original one (Bug: 21178876).


Change-Id: I59acc161e7d8cba633718a3d17292e68740ef79e
 2015-06-10 15:02:22 +00:00
Chet Haase
f8aed4589e am 15fb34d2: am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit '15fb34d2ea6282144a3826bbe3f3ae122b6dd755':
  Clarify docs for Animator.isStarted()
 2015-06-10 15:02:09 +00:00
Chris Wren
1d8d111a16 am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '7f588404c531db878597f1221d56907c5c40de5e':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 15:02:04 +00:00
Andrew Flynn
4fda24fece am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'c570a6290f6051346bbbfb0e9e8fbe8d7ede8d99':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-10 15:01:32 +00:00
Andrei Stingaceanu
52243ad30d am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
* commit '15f4dd72192f11982a41d2fd92b7c2302b521476':
  Completely remove ExtractActionMode from ExtractEditLayout
 2015-06-10 15:01:27 +00:00
Chet Haase
81728b862e Merge "Clarify docs for Animator.isStarted()" into mnc-dev 2015-06-10 14:27:47 +00:00
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev 
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:14:41 +00:00
Abodunrinwa Toki
7aa6d0a4b1 Change FloatingToolbar entry/exit animations to fadeIn/fadeOut. 
Bug: 21307167
Change-Id: I7f75e064c264666ad0e8f84d5421fcc15176ee3f
 2015-06-10 13:45:25 +01:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Chris Banes
1f5714c610 am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd64c5befd61434168b16f6eb1b722b7d3512f15a':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:57:52 +00:00
Chet Haase
4ddd9257d6 Clarify docs for Animator.isStarted() 
Behavior is different than spec'd for one-shot animators, clarified
docs to reflect that.

Issue #21087798 better docs for isStarted()

Change-Id: I499a5d52cf02ef715acb6ae0635ede4328c93de8
 2015-06-10 10:42:50 +01:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Martijn Coenen
0c2d3d93dd am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit 'b1c579df0be37a43101f2a2c8205b2fe648c1377':
  Make peer LLCP version an int.
 2015-06-10 07:20:39 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00