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

125754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ricardo Cervera
420d97fbc8 docs: Updated Building your First App tutorial. Bug: 13429905 
-Updated default code in activities from ADT
-Updated screenshots for ADT wizards when changed
-Updated activity_ with fragment_ where required
-Other minor changes

Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html

Patch: Removed border from the new ADT screenshots.
Patch: Replaced device screenshots using an Android 4.4 device.
Patch: Addressed Katie's comments.

Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
 2014-03-13 14:59:59 -07: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
Marco Nelissen
7e435a011d Verify certificates 
b/13418320

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
 2014-03-13 14:18:59 -07:00
JP Abgrall
4ecd833ee3 am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-13 20:36:51 +00:00
JP Abgrall
7baa7c8045 Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 2014-03-13 20:33:44 +00:00
Ruben Brunk
dba764426b Merge "camera3: Pass vendor tags through binder." 2014-03-13 20:18:37 +00:00
Craig Mautner
1066fc61a3 Resolved conflicts for merge of ad63d914 to jb-mr2-dev 
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
 2014-03-13 12:35:23 -07: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
Chad Brubaker
78f204aed8 am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-13 18:12:36 +00:00
Chad Brubaker
8e240af51d Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 2014-03-13 18:09:58 +00: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
Jose Lima
4882ddfae2 am 53ac5ef2: am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '53ac5ef2141c7e7d99d5c00195bc65e86e7fc403':
  Add banner attribute to app manifest
 2014-03-13 18:08:51 +00:00
Christopher Tate
83b31aae81 am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'd5b25cbd570680c361da8807fdfddf135472d338':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 18:08:49 +00:00
Baligh Uddin
e4f1c8ab27 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 'c48e3d03436bd428ef5425114ea138ae097f1f20':
  Import translations. DO NOT MERGE
 2014-03-13 18:08:46 +00: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