drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
222,078 Commits 1 Branch 0 Tags
Commit Graph

222078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xiaohui Chen
60c2e34543 cmds: fix settings command help msg 
There is a missing white space.

Change-Id: I7e7f4783464a7be02a3b2e1a30a629ed1ebdc913
 2015-11-18 14:10:42 -08:00
Xiaohui Chen
d3e9e1835b Skip dead users when getting primary. 
Bug: 25769085
Change-Id: I220d175839509e4dbf3f2992a90e9625d0caf825
 2015-11-18 13:37:32 -08:00
Nicolas Geoffray
0283d44c08 Merge "Remove DEBUG_JIT from Zygote flags." 2015-11-17 12:26:01 +00:00
Daichi Hirono
26398b91be Merge "Start using MtpDatabase in DocumentLoader." 2015-11-17 06:47:45 +00:00
Daichi Hirono
47eb192b27 Start using MtpDatabase in DocumentLoader. 
BUG=25704514

Change-Id: I4d9247c148679ee7e40a1a03443e4c0299b1e44d
 2015-11-17 15:46:40 +09:00
Sungsoo Lim
c09818e0d8 Merge "Make TvContentRating.contains() public" 2015-11-17 06:35:16 +00:00
Filip Gruszczynski
1d21988fe1 Merge "Don't animate move triggered by resizing using dock divider." 2015-11-17 05:07:56 +00:00
Filip Gruszczynski
f52dd205b9 Don't animate move triggered by resizing using dock divider. 
Also includes some small, nice refactoring:
* move code that sets the move animation into WindowStateAnimator;
* a few fields can be made private in WindowStateAnimator this way;
* one boolean flag in WindowStateAnimator popped out as unused after
being privatized, so could be deleted.

Bug: 25690109
Change-Id: I8144114244892c4f27aff21455e8e76eddbd039f
 2015-11-16 21:05:37 -08:00
Joe LaPenna
078d47c01f Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours am: dbe1804f58 -s ours am: 9cb81aa210 -s ours 
am: 6412751108  -s ours

* commit '6412751108070a3e591546d4bc6e660fea52b49f':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 04:02:41 +00:00
Sanket Padawe
cf92718bb9 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 am: 7bb34d7517 am: fc8f7cee01 
am: 5c63189f4a

* commit '5c63189f4a83c71d6c7a8e705e5560cb353e4b69':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 04:01:10 +00:00
Deepanshu Gupta
efc90e4f60 Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7 am: 9f275ec3fd 
am: d00380a560

* commit 'd00380a560dff6a2237086f2f4c96313785ce93f':
  WindowDecorActionBar name change fix.
 2015-11-17 03:59:41 +00:00
Michael Kwan
5aac37c114 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours am: 2c8f3734af -s ours 
am: 03f62d7af2  -s ours

* commit '03f62d7af2cd6618ed775b4183fa5cb3a274e01d':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-17 03:58:01 +00:00
Rom Lemarchand
9c5ac7bf5b resolve merge conflicts of 152d353e87 to master. 
Change-Id: Ida54b932d0a077d6eaeb2418a6cbf58f96035fff
 2015-11-16 19:48:50 -08:00
Joe LaPenna
6412751108 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours am: dbe1804f58 -s ours 
am: 9cb81aa210  -s ours

* commit '9cb81aa210419ea14ff396fb533ad500094b00f2':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 03:11:51 +00:00
Joe LaPenna
9cb81aa210 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours 
am: dbe1804f58  -s ours

* commit 'dbe1804f580dcde68ac272b865808a8263219efb':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 03:03:13 +00:00
Joe LaPenna
dbe1804f58 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours 
am: 7f0a1556ec  -s ours

* commit '7f0a1556ecebe9cd861296897000e4b61f541158':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 02:55:44 +00:00
Joe LaPenna
7f0a1556ec Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev 
am: d083b37917  -s ours

* commit 'd083b379174b6cdfdd40204f4d4f4207fa2f332e':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 02:47:59 +00:00
Joe LaPenna
d083b37917 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev 2015-11-17 02:42:22 +00:00
Joe LaPenna
f6ca46d301 Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE" 
This reverts commit 88c7c3e08051f4a2be8ee5194214678a07ff7f01.

Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG: 23753686
 2015-11-17 02:42:10 +00:00
Sanket Padawe
5c63189f4a Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 am: 7bb34d7517 
am: fc8f7cee01

* commit 'fc8f7cee0124bee1c75f05a18c112e37705836a9':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 02:06:14 +00:00
Sanket Padawe
fc8f7cee01 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 
am: 7bb34d7517

* commit '7bb34d7517cfef519a01e365c0da665852ac6b0b':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:58:39 +00:00
Sanket Padawe
7bb34d7517 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 
am: 32a190bd78

* commit '32a190bd787cbecfc4c87cda50ab6973b9e1c3cb':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:43:07 +00:00
Deepanshu Gupta
d00380a560 Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7 
am: 9f275ec3fd

* commit '9f275ec3fd422045f95c048905b112c0a93f4d34':
  WindowDecorActionBar name change fix.
 2015-11-17 01:37:54 +00:00
Sungsoo Lim
70ffbdca62 Make TvContentRating.contains() public 
Apply the feedback from API council.

Bug: 25726616
Change-Id: I9858a61eea50ff95221d453117fe3d991f88a33f
 2015-11-17 10:34:04 +09:00
Sanket Padawe
32a190bd78 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae 
am: 63e6aa8571

* commit '63e6aa8571386dcf33ff0cf3949bdaf6c8e350db':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:33:24 +00:00
Deepanshu Gupta
9f275ec3fd Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a 
am: 80bd5e6fd7

* commit '80bd5e6fd77eb93c5e7f29cce279f8194be4478b':
  WindowDecorActionBar name change fix.
 2015-11-17 01:28:58 +00:00
Sanket Padawe
63e6aa8571 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 
am: ccfcb636ae

* commit 'ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:23:47 +00:00
Deepanshu Gupta
80bd5e6fd7 Merge "WindowDecorActionBar name change fix." into mnc-ub-dev 
am: 62302bd72a

* commit '62302bd72aaa6b0f934257447e8dcd636799180e':
  WindowDecorActionBar name change fix.
 2015-11-17 01:17:25 +00:00
Sanket Padawe
ccfcb636ae Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev 
am: abea6dc466

* commit 'abea6dc466cbd01be261192f8dbc083b58661bad':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:12:48 +00:00
Deepanshu Gupta
62302bd72a Merge "WindowDecorActionBar name change fix." into mnc-ub-dev 2015-11-17 01:11:10 +00:00
Sanket Padawe
abea6dc466 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev 2015-11-17 01:07:28 +00:00
Daichi Hirono
0fe13b1f70 Merge "Add a mehtod definition to StorageManager for appfuse." 2015-11-17 01:05:20 +00:00
Dianne Hackborn
1653ac4395 Merge "Don't send PACKAGE_CHANGED of components to manifest receivers." 2015-11-17 00:41:35 +00:00
Dianne Hackborn
354c3bc394 Merge "Some debugging improvements." 2015-11-17 00:41:07 +00:00
Dianne Hackborn
627dfa1dda Be smarter about determining when we can stop idle maintenance. 
The device idle service now knows when the system is actively
doing significant things (syncs, jobs, alarms, downloads).  It
uses this, when in an idle maintenance window, to determine when
it can end that window early -- when such work is no longer
happening.

For now this just allows us to shorten the windows.  In the future
we should use this to allow us to expand the windows to a longer
potential time, adjusting future windows to shorter durations if
earlier ones use more time.  This will allow us to batch occasional
long operations (such as downloads) into one window, making up
for that with much shorter later windows.

Change-Id: Ie482abd50bc43be9a8917a769a5175851eee4ec4
 2015-11-16 16:38:29 -08:00
Michael Kwan
03f62d7af2 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours 
am: 2c8f3734af  -s ours

* commit '2c8f3734afd5f104166bfb045794970414eb5052':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-17 00:14:34 +00:00
Michael Kwan
2c8f3734af DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours 
am: b0aae584ea  -s ours

* commit 'b0aae584ea2a5649ac113ba05c88cbbe6616709e':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-17 00:06:28 +00:00
Adam Lesinski
f20bfb6776 Merge "AAPT2: Prevent duplicate enums/flags" 2015-11-17 00:00:48 +00:00
Adam Lesinski
abf83cbe4f AAPT2: Prevent duplicate enums/flags 
Change-Id: I998cba12ac194000e9c778cb620ed7ab33003e7d
 2015-11-16 15:59:10 -08:00
Michael Kwan
b0aae584ea DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours 
am: f23229f45f  -s ours

* commit 'f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-16 23:57:47 +00:00
Michael Kwan
f23229f45f DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. 
am: 8d6630b87c  -s ours

* commit '8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-16 23:48:39 +00:00
Deepanshu Gupta
2b0551175d WindowDecorActionBar name change fix. 
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.

Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
 2015-11-16 15:46:12 -08:00
Wale Ogunwale
5e7fda2ea1 Merge "Crop window input region to stack bounds." 2015-11-16 23:45:13 +00:00
Adam Lesinski
33461a0c32 Merge "AAPT2: Fix tokenizer to deal with the separator as last char" 2015-11-16 23:44:49 +00:00
Adam Lesinski
cf95a58014 AAPT2: Fix tokenizer to deal with the separator as last char 
When the separator was the last character, the tokenizer would skip
the empty string, which is wrong.

Change-Id: I64ceb4e8d4ac48ee41d40781ab5785a3bc61b24d
 2015-11-16 15:44:08 -08:00
Daichi Hirono
9e8d9e250b Add a mehtod definition to StorageManager for appfuse. 
BUG=25091416

Change-Id: Id4d4a000daf89fab4917528fcd0d1270547fbfa4
 2015-11-17 08:44:06 +09:00
Adam Lesinski
196c8e7013 Merge "AAPT2: Fix a bug where files would only show up for one config" 2015-11-16 23:41:25 +00:00
Jeffrey Vander Stoep
cb60f71c71 Merge "fix ApplicationInfo flag collision" 2015-11-16 23:33:53 +00:00
Daichi Hirono
4604b74603 Prepare for adding MtpDocumentsProvider tests to APCT. 
BUG=25093356

Change-Id: I0c194e6bf3abeb632171e9be49471b9d94a0cb4c
 2015-11-17 08:30:41 +09:00
Jeff Vander Stoep
9edb7bf4c6 fix ApplicationInfo flag collision 
Give PRIVATE_FLAG_AUTOPLAY unique value

Bug: 25726468
Change-Id: I1dabe26eb4c72004ebd7e33252240e10c15c9159
 2015-11-16 15:23:38 -08:00