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

119845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dave Platt
97121c923c Harden NsdManager against null-dereference crashes 
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state.  This causes dereferencing of
null objects, and a crash.

Split out the three async-queue message cases:  these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.

Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.

Safeguard accesses to the "NSD service type" string from a possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.

Bug: 9016259

Manual cherrypick of commit b1fbb14122a99c62363a949dd634294f5e887ef,
change-ID I7a6ff6842cf035cefbafe2a023ae1fd43734081e in master.

Change-Id: I8d9b7a1763d47d061a0f46b3cb453de4bdb8c2ed
 2014-03-13 17:27:03 -07: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
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
Craig Mautner
e0663591a5 Fix activities appearing behind launcher icons 
cherry picked from d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866

Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
 2014-03-13 16:16:20 -07: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
Ricardo Cervera
7e56623965 Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 2014-03-13 22:21:45 +00: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
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
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
Craig Mautner
1066fc61a3 Resolved conflicts for merge of ad63d914 to jb-mr2-dev 
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
 2014-03-13 12:35:23 -07: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
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
ad63d91439 am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '20a4f490957407b9534fc453833de2fe2f276426':
  Show the keyguard if unsecure window on top
 2014-03-13 11:01:13 -07:00
Craig Mautner
20a4f49095 am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '817f5586053ae135a59cd0768980ca741e9215b0':
  Show the keyguard if unsecure window on top
 2014-03-13 10:58:11 -07:00
Craig Mautner
817f558605 am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '3d958f81c54252b452631ea1bb6e7954fc7066c8':
  Show the keyguard if unsecure window on top
 2014-03-13 10:55:31 -07:00
Craig Mautner
3d958f81c5 am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '468e8e9873d764c090576d70aebf658e3e89bbfe':
  Show the keyguard if unsecure window on top
 2014-03-13 10:51:39 -07:00
Craig Mautner
468e8e9873 am 1f52437d: Show the keyguard if unsecure window on top 
* commit '1f52437de9aa6089a72c7c992f9e7291a6a96115':
  Show the keyguard if unsecure window on top
 2014-03-13 10:47:49 -07:00
Jose Lima
91726f4ea7 Merge "Add banner attribute to app manifest" into klp-modular-dev 2014-03-13 17:40:37 +00:00
Svetoslav
fc1d04714e am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-13 17:31:03 +00:00
Svetoslav
11b7d9fa66 Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 2014-03-13 17:26:44 +00:00
Adrian Roos
16858164c7 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-13 17:26:26 +00:00
Adrian Roos
cd0d8cb2d9 Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 2014-03-13 17:22:58 +00:00
Christopher Tate
aaaeb6a21b am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit '87503f8561296fea489f8a3fe8384f61150976da':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 17:19:17 +00:00
Baligh Uddin
4c9ebc4c14 am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
  Import translations. DO NOT MERGE
 2014-03-13 17:19:14 +00:00
Joe Fernandez
f7267c8bdc Merge "Doc change: Update developer video on home page carousel." into klp-docs 2014-03-13 17:15:16 +00:00
John Spurlock
6d9b034ce1 Fix typo in public logcat page. 
Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
 2014-03-13 12:40:12 -04:00
Baligh Uddin
a5a921e3a8 am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4545b1d29b23cbfe11aa7ca6b54f6518a38db278':
  Import translations. DO NOT MERGE
 2014-03-13 16:25:45 +00:00
Ricardo Cervera
ef6c947005 Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 2014-03-13 16:23:32 +00:00
Baligh Uddin
4545b1d29b Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-13 16:22:53 +00:00
Adrian Roos
91c9561cbe DO NOT MERGE - Fix keyguard pattern lockout bug 
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
 2014-03-13 13:42:29 +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
Jason Sams
0ebc6b378d Force merge of remaining KLP changes to fix build. 
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
 2014-03-13 01:49:05 -07:00
Jason Sams
fc15f899b8 Fix build issues from bad merge 
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
 2014-03-13 01:17:49 -07:00