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

125525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
629daddd03 Merge "Fix layoutlib build." 2014-03-14 14:12:35 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build. 
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
 2014-03-14 14:10:30 +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
Jeff Brown
f0e2988f87 am d8b17079: am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev 
* commit 'd8b170799f1cb00825a4a947901d4b214d20c5a1':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)
 2014-03-14 06:11:02 +00:00
Jose Lima
92703e62c1 resolved conflicts for merge of 4882ddfa to master 
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
 2014-03-13 21:26:48 -07:00
Jeff Brown
d8b170799f am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev 
* commit '6ae4d53b571cb71cc6c2ad55d12679d22e9334d5':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)
 2014-03-14 04:12:08 +00:00
Jeff Brown
6ae4d53b57 resolved conflicts for merge of db3146c0 to klp-modular-dev 
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
 2014-03-13 21:07:33 -07:00
Yohei Yukawa
fd2f8d4341 am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit '51b921d0e33302b3f431dcfa15bd6588408525ea':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 03:03:08 +00:00
Yohei Yukawa
51b921d0e3 DO NOT MERGE - Preserve the order of InputMethodManager method calls 
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520

This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.

InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.

See the following demo code:

  Final InputMethodManager imm = ...;
  imm.setAdditionalInputMethodSubtypes(id, subTypes);
  Final List<InputMethodInfo> ims = imm.getInputMethodList();

Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.

With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.

BUG: 13033954
BUG: 13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
 2014-03-14 11:52:09 +09:00
Craig Mautner
a921d8b6b1 am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit '3217cc6ff2b3139d8854a3f681da6ae1d163ac92':
  Fix activities appearing behind launcher icons
 2014-03-14 00:42:43 +00:00
Craig Mautner
3217cc6ff2 Merge "Fix activities appearing behind launcher icons" into klp-dev 2014-03-14 00:40:20 +00: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
Winson Chung
4d7b092a86 Fixing memory leaks related to Tasks holding onto their callbacks. 
- Switching to SwipeHelper
 2014-03-13 17:14:17 -07: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
Mike Lockwood
ff64f5ed7c am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit '381374b3cd66f364fd644c21f2d9128bcde2f58a':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-13 23:34:46 +00:00
Mike Lockwood
381374b3cd Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 2014-03-13 23:32:17 +00: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
Craig Mautner
e0663591a5 Fix activities appearing behind launcher icons 
cherry picked from d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866

Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
 2014-03-13 16:16:20 -07: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
Ricardo Cervera
5069491737 am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 
* commit '7e566239656c1de32a3bf695cd2ea3a28f1e906b':
  docs: Updated Building your First App tutorial. Bug: 13429905
 2014-03-13 22:25:20 +00:00
Mike Lockwood
885ddcaa6d Merge "MTP: Add support for some audio specific object properties" 2014-03-13 22:25:09 +00:00
Ricardo Cervera
7e56623965 Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 2014-03-13 22:21:45 +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
Joe Fernandez
8bb11153f9 am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs 
* commit 'f7267c8bdc5431d486e8bb34722d492be82e44f3':
  Doc change: Update developer video on home page carousel.
 2014-03-13 22:15:11 +00:00
John Spurlock
ad66c27b9c am 6d9b034c: Fix typo in public logcat page. 
* commit '6d9b034ce169eeaa7e49574f4694ec96651c7f4e':
  Fix typo in public logcat page.
 2014-03-13 22:15:09 +00:00
Ricardo Cervera
8714a3437e am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 
* commit 'ef6c94700589958789039749248895a2631ebe55':
  docs: Added step to get JDK to the Android Studio install instructions.
 2014-03-13 22:15:06 +00:00
Katie McCormick
b681794d25 am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit '07c0ad973a2fdd8a35b3627e69f1134673c8b8e0':
  Doc update: new doc studio layout editor
 2014-03-13 22:15:01 +00:00
John Spurlock
62826f55be am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit 'f6228d95eae7b05dd0015b3062e72c89148e65a2':
  Fix doc typos in AppOpsManager.java
 2014-03-13 22:14:57 +00: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
Tim Kilbourn
f94b6a93a4 Add leanback device features. 
android.software.leanback - the device supports leanback UIs.
android.software.leanback_only - the device ONLY supports leanback UIs.

leanback_only is a hidden feature for now.

Change-Id: I497bd96464125ad81212c804e150f210f3e95af2
 2014-03-13 15:02:54 -07:00