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

119422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
3e041ec277 am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit 'b681794d2583e06693c23eec1af4e282b067abd9':
  Doc update: new doc studio layout editor
 2014-03-14 04:13:05 +00:00
John Spurlock
919fc360c3 am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '62826f55be4415684b4e321469298ba43d598bbb':
  Fix doc typos in AppOpsManager.java
 2014-03-14 04:13:00 +00:00
JP Abgrall
e67658d6e2 am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 04:12:54 +00:00
Chad Brubaker
e0627cf869 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 04:12:46 +00:00
Svetoslav
eccd4a5f92 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 04:12:42 +00:00
Adrian Roos
e2c6391587 am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-14 04:12:39 +00:00
Baligh Uddin
50ff2f4cd7 am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
  Import translations. DO NOT MERGE
 2014-03-14 04:12:32 +00:00
Dianne Hackborn
d553313ac7 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 
* commit 'e5191aabff5b9b751349b8634836a858af744905':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
 2014-03-14 04:12:24 +00:00
Jeff Brown
ba6b897816 resolved conflicts for merge of 825dd9dd to klp-dev-plus-aosp 
.
Change-Id: I2363c40f641e7e60487354e1710312db2cbbc89a
 2014-03-13 21:10:40 -07:00
Craig Mautner
ff89d589c7 Merge commit '3b9de0a4' into manualmerge 
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
 2014-03-13 21:09:35 -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
3b9de0a429 am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev 
* commit '00e12e61472d850c00cf1e479fda2b371ead1257':
  Show the keyguard if unsecure window on top
 2014-03-13 19:47:29 -07:00
Craig Mautner
00e12e6147 am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev 
* commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c':
  Show the keyguard if unsecure window on top
 2014-03-13 19:40:49 -07: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
Zhihai Xu
cb6cd536aa am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev 
* commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
 2014-03-14 00:40:32 +00:00
Craig Mautner
3217cc6ff2 Merge "Fix activities appearing behind launcher icons" into klp-dev 2014-03-14 00:40:20 +00:00
Jeff Brown
ad97aa8a98 am db3146c0: am 15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE) 
* commit 'db3146c039750f68418e0908037a8bed3890913c':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)
 2014-03-14 00:40:20 +00:00
Adam Powell
b61d39957b 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-14 00:40:11 +00:00
Dave Platt
dec3c628de 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:41:28 +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
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
Brian Carlstrom
22abe3829b resolved conflicts for merge of 9af19bee to klp-dev-plus-aosp 
Change-Id: I70f34a6523fb43129cfe7d4c7308bc3b7353f57c
 2014-03-13 16:10:32 -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
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
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
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