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

125366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
6413a7128f am 6395c6a4: am 6cde6c75: am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '6395c6a4909749d54679be16411783ccaeba4372':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-14 17:13:03 +00:00
Dave Platt
6b2b14028d am cb1254f1: am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit 'cb1254f1abc44b82e2a9da0d9a73230eb46e129e':
  NsdService does not clean up after exiting clients
 2014-03-14 13:13:38 +00:00
Brian Carlstrom
2df4b6a050 am 2facefe6: am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp 
* commit '2facefe648996732c61a8a26c76704faa6d20e56':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-14 13:13:34 +00:00
Naofumi Harada
73dca27479 am 0a167a98: (-s ours) am 107041e2: am 03263ce3: am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '0a167a98658afdb220ffd62b00d2e65d2baed3d3':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-14 10:34:34 +00:00
Chad Brubaker
d361964510 am 0b925975: (-s ours) am 48dd8b0f: am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '0b925975b88c91285df97ca26cebb8f8429ec0da':
  Only allow System apps to make VPN exempt routes
 2014-03-14 10:34:30 +00:00
Chad Brubaker
8a48ebb0a0 am 6467e900: (-s ours) am 7f68f7f4: am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '6467e900a1211de65ae70cc722c871987e0b6531':
  Add the calling package name to requestRouteToHost
 2014-03-14 10:28:28 +00:00
Jose Lima
92703e62c1 resolved conflicts for merge of 4882ddfa to master 
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
 2014-03-13 21:26:48 -07:00
Christopher Tate
87dbf308fc am 83b31aae: (-s ours) am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit '83b31aae81402c2b10bd711bc14c6ebdfe4c85bf':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-14 00:23:10 +00:00
Baligh Uddin
25e41f4345 am e4f1c8ab: (-s ours) am c48e3d03: (-s ours) am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e4f1c8ab271c06c03d7b962efed9a669f3c8986b':
  Import translations. DO NOT MERGE
 2014-03-14 00:23:06 +00:00
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
Adam Powell
6395c6a490 am 6cde6c75: am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '6cde6c75b3469b7f76343ef7fc646f65c8393a17':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:59:57 +00:00
Adam Powell
6cde6c75b3 am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:57:19 +00:00
Adam Powell
41685ce983 am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:53:38 +00:00
Dave Platt
cb1254f1ab am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit 'e4e6b3cc1908c60bd0e45063116cf935b7aad56a':
  NsdService does not clean up after exiting clients
 2014-03-13 23:47:32 +00:00
Brian Carlstrom
2facefe648 am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp 
* commit '00d115a7533df23027f671c90c0ae52684392e4a':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-13 23:43:37 +00:00
Dave Platt
e4e6b3cc19 am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit '21384faa2b3da619a54b35f15936c00593b30694':
  NsdService does not clean up after exiting clients
 2014-03-13 23:42:03 +00:00
Dave Platt
21384faa2b am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit 'f3a2895a31069a7c01c69d011b290fcfb3298b3c':
  NsdService does not clean up after exiting clients
 2014-03-13 16:38:59 -07:00
Dave Platt
f3a2895a31 Merge "NsdService does not clean up after exiting clients" 2014-03-13 23:35:15 +00:00
Brian Carlstrom
00d115a753 resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp 
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
 2014-03-13 16:35:09 -07:00
Dave Platt
f31760c634 NsdService does not clean up after exiting clients 
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.

If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).

Bug: 9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
 2014-03-13 23:16:30 +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
Naofumi Harada
0a167a9865 am 107041e2: am 03263ce3: am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '107041e299a48f9624bf7a70c003effac1c363ce':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-13 18:30:31 +00:00
Chad Brubaker
0b925975b8 am 48dd8b0f: am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '48dd8b0fc0090ebf6cef0a9ac045fc480dd31397':
  Only allow System apps to make VPN exempt routes
 2014-03-13 18:30:28 +00:00
Chad Brubaker
6467e900a1 am 7f68f7f4: am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '7f68f7f4a128538c1bbd33c82a40f0cc15994bf9':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:30:25 +00:00
Naofumi Harada
107041e299 am 03263ce3: am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '03263ce38aaca11300595af19d313a9f6e3ead96':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-13 18:23:03 +00:00
Chad Brubaker
48dd8b0fc0 am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '74f99a4e904af56a62f86b81831c23c763b6001e':
  Only allow System apps to make VPN exempt routes
 2014-03-13 18:23:00 +00:00
Chad Brubaker
7f68f7f4a1 am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:22:57 +00:00
Narayan Kamath
aa737c49df am 9af19bee: am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt. 
* commit '9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-13 18:18:48 +00:00
Naofumi Harada
03263ce38a am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-13 18:18:45 +00:00
Chad Brubaker
74f99a4e90 am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '7fb074389370ac93afc5830189371dc3ec26265c':
  Only allow System apps to make VPN exempt routes
 2014-03-13 18:18:40 +00:00
Chad Brubaker
f5729a6a15 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:18:36 +00: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