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

125308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
050246e0eb am 70994e9e: (-s ours) am d7cc4bf4: am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '70994e9eef43b6cf95ec6cf553dd97bf92567587':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-14 00:23:03 +00:00
Alan Viverette
d2df12c219 am 17bbdcc5: (-s ours) am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '17bbdcc549a0469fa3d8ed5778e77964ab7caf2d':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-14 00:22:59 +00:00
Alan Viverette
38a3ddf44a am c59474d2: (-s ours) am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'c59474d2813be8df40090ca121f9570977796aa7':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-14 00:22:56 +00:00
Adam Powell
2e8436b462 am b287043c: am 4a5c9e94: am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit 'b287043c3d31e8360ba5c11bd6dafda7288db8a9':
  Fix a bug in submenu presenter priority handling
 2014-03-14 00:22:48 +00:00
Jason Sams
3bab28f9e9 am 440613f5: am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '440613f5c35577f9a5bbc087b2e306e37bb8f94e':
  Force merge of remaining KLP changes to fix build.
 2014-03-14 00:22:45 +00:00
Jason Sams
a9b8bf053c am 21f97de0: am 35a9e339: am fc15f899: Fix build issues from bad merge 
* commit '21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2':
  Fix build issues from bad merge
 2014-03-13 23:12:01 +00:00
Jason Sams
da8c79d378 am 4a268aff: am 534606b4: am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '4a268affbf2a15d68171036a941c2404eae07833':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 23:11:58 +00:00
Mike Lockwood
885ddcaa6d Merge "MTP: Add support for some audio specific object properties" 2014-03-13 22:25:09 +00:00
Mike Lockwood
92b53bc2dd MTP: Add support for some audio specific object properties 
This stops Windows 7 from putting up the
"Your device might not be able to play or view this file" dialog
when copying MP3 files to the device.

Bug: 3195286
Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
 2014-03-13 15:15:26 -07:00
Hui Shu
57ad97fb70 Merge "Add removeApi commandline option for doclava and an empty removed.txt" 2014-03-13 22:11:41 +00:00
John Reck
19caf39612 Merge "App compat" 2014-03-13 22:06:23 +00:00
John Reck
40503f9f8c App compat 
Bug: 13450310

Change-Id: I32d948a243385d1bb9f2615759127f4b13ce01bd
 2014-03-13 14:53:13 -07:00
Maxim Siniavine
3b98789a0e Merge "Fixes for download manager test." 2014-03-13 21:29:45 +00:00
John Spurlock
57392e14cd Merge "Add more information to existing notification_* events." 2014-03-13 21:26:35 +00:00
Jason Sams
b71af7535b am 457c9554: am 2ffcffd0: am 280db650: am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '457c9554766f8c0645c53e2317bb024ad28797fa':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 21:20:35 +00:00
Jason Sams
1d1cfa9a8d am abe8dfb0: am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit 'abe8dfb0e37284395b36420ed62f1a93b99bdaf2':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 21:20:31 +00:00
Michael Wright
6392966367 am 444b0c6b: (-s ours) am f80f60ba: am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 
* commit '444b0c6b72bf508e3a672fe34d0f4b00cfea19f9':
  Controllers must have buttons and a movement mechanism.
 2014-03-13 21:20:12 +00:00
Ruben Brunk
dba764426b Merge "camera3: Pass vendor tags through binder." 2014-03-13 20:18:37 +00:00
Ruben Brunk
85c4388de1 camera3: Pass vendor tags through binder. 
Bug: 12134423

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
 2014-03-13 12:14:49 -07:00
John Spurlock
e6a7d93420 Add more information to existing notification_* events. 
Include calling UID/PID in the existing
notification_{enqueue/cancel/cancel_all} event logs.

Include a new "reason" arg for cancel + cancel_all to
identify listener vs noman vs statusbarmgr calls.

Found and fixed a cancelAll path (from statusbarmgr)
that was not logging at all.

Bug:13442201
Change-Id: I2e1f875076a96b1fe3b86e8990641efb1cadfcfb
 2014-03-13 14:18:18 -04:00
Craig Mautner
aea74a5977 Add Lock Task Mode. 
When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.

Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
 2014-03-13 11:09:13 -07:00
Alan Viverette
70994e9eef am d7cc4bf4: am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'd7cc4bf482d69d146eb5386b790816c8a46f278a':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:08:43 +00:00
Alan Viverette
17bbdcc549 am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '839321a362ec1cd40fc7267a7883641bcc8ee429':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:08:40 +00:00
Alan Viverette
c59474d281 am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:08:37 +00:00
Adam Powell
b287043c3d am 4a5c9e94: am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '4a5c9e941a78299d869b4c9d916fd86187057150':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:08:34 +00:00
Jason Sams
440613f5c3 am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '276565c83c05e24819454dea4008ad5096792e4f':
  Force merge of remaining KLP changes to fix build.
 2014-03-13 18:08:31 +00:00
Alan Viverette
d7cc4bf482 am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:02:17 +00:00
Alan Viverette
839321a362 am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'c25dbb50c30816c97227b9a26cc46afec4e5318e':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:02:14 +00:00
Alan Viverette
ba3d0fd5fc am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'af6288b721110ffc4b4e68d55398b5ca31fc32e8':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:02:11 +00:00
Adam Powell
4a5c9e941a am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '68ec033b7c9ea28155bbb007b01d5dbce2239392':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:02:08 +00:00
Jason Sams
276565c83c am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
  Force merge of remaining KLP changes to fix build.
 2014-03-13 18:02:03 +00:00
Mike Lockwood
1cb98aeaad Merge "USB: Add support for disabling USB permission dialogs." 2014-03-13 17:58:33 +00:00
Mike Lockwood
e97b62ed0d USB: Add support for disabling USB permission dialogs. 
Setting scom.android.internal.R.bool.config_disableUsbPermissionDialogs to true
will disable all USB permission dialogs, allowing apps access to USB devices
and accessories by default.

For prototyping purposes only. This should not be used in real devices.

Bug: 13437578
Change-Id: Ie7bf83882943930b15e5f1edb3044a4a52034273
 2014-03-13 10:26:53 -07:00
Dianne Hackborn
08fc3a7fc2 Merge "Fix some uid issues in battery stats." 2014-03-13 17:04:54 +00:00
Dianne Hackborn
bbb7472b8e Fix some uid issues in battery stats. 
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
 2014-03-13 09:50:24 -07:00
Baligh Uddin
5468ae4125 Merge "Import translations. DO NOT MERGE" 2014-03-13 16:22:49 +00:00
Baligh Uddin
df385f2b4c Merge "Import translations. DO NOT MERGE" 2014-03-13 16:22:45 +00:00
Jaewan Kim
68c9d2592c Merge "EthernetDataTracker: Return proper interface name" 2014-03-13 12:07:36 +00:00
Kenny Guy
4979ff9f28 Merge "Show notifications from related users." 2014-03-13 11:57:55 +00:00
Jason Sams
21f97de0bc am 35a9e339: am fc15f899: Fix build issues from bad merge 
* commit '35a9e339687a0c5423c3433ff0c335ad9e1e0656':
  Fix build issues from bad merge
 2014-03-13 10:53:01 +00:00
Jason Sams
4a268affbf am 534606b4: am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '534606b44a865874b00fba24517a8e218ec56075':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 10:52:56 +00:00
Jason Sams
35a9e33968 am fc15f899: Fix build issues from bad merge 
* commit 'fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8':
  Fix build issues from bad merge
 2014-03-13 10:50:19 +00:00
Jason Sams
534606b44a am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '632c915ce8675033bbb7d356239d16594b26dffb':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 10:50:15 +00:00
Alan Viverette
cf2b65ce7a am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '9ebe031cdc916646e95ffcd92dde67e1655be7ba':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 10:01:39 +00:00
Alan Viverette
c25dbb50c3 am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 10:01:35 +00:00
Alan Viverette
af6288b721 am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 10:01:30 +00:00
Adam Powell
68ec033b7c am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '75958c298477a3d1e556c4fe36e516b9e828c311':
  Fix a bug in submenu presenter priority handling
 2014-03-13 10:01:15 +00:00
Alexandra Gherghina
aaebbbff73 Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps." 2014-03-13 09:31:53 +00:00
Jason Sams
457c955476 am 2ffcffd0: am 280db650: am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '2ffcffd046e321b871a04480552cef6ee4735e62':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 09:28:22 +00:00
Jason Sams
abe8dfb0e3 am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:28:19 +00:00