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

97607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
40ddc2bf40 am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev 
* commit 'bc305e554427d22420746c66ab67a236c424fec0':
  Fix longstanding nonsense in javadocs.
 2012-12-06 11:34:40 -08:00
You Kim
87c1b3127e Wrong parameter in LocationManagerService 
Fix wrong parameter in removeTestProvider

Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: You Kim <you.kim72@gmail.com>
 2012-12-07 04:33:05 +09:00
Daniel Sandler
bc305e5544 Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev 2012-12-06 11:31:50 -08:00
Eric Laurent
942de41bb1 Merge "more fixes on safe volume warning message" 2012-12-06 11:26:40 -08:00
Glenn Kasten
f0336d11f5 Merge "Remove whitespace at end of line" 2012-12-06 11:14:05 -08:00
Adam Cohen
224d222508 am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev 
* commit '29cfce7a387c5f1ea92a310398ed4ed213a3cf62':
  Making sure to clear state related to views that are being recycled (issue 7650538)
 2012-12-06 11:05:31 -08:00
Irfan Sheriff
4bbfa9dbb0 am 628ba035: am 1612e298: Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 
* commit '628ba035b3c0636826f3eee3ae78da628cc1a8c8':
  AsyncChannel to support remote death notification and post a disconnect message to the source handler.
 2012-12-06 11:03:20 -08:00
Adam Cohen
29cfce7a38 Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev 2012-12-06 11:02:58 -08:00
Adam Cohen
ff06719077 Making sure to clear state related to views that are being recycled (issue 7650538) 
Change-Id: I5161ac261f963789537d2066a472cd3036c218aa
 2012-12-06 11:01:09 -08:00
Irfan Sheriff
628ba035b3 am 1612e298: Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 
* commit '1612e29826dfe55f8deca27374046c5931ce5335':
  AsyncChannel to support remote death notification and post a disconnect message to the source handler.
 2012-12-06 10:59:10 -08:00
Irfan Sheriff
88b41a589d am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process" 
* commit '46e380795216c58acbd38af532ac1626e105866a':
  Prevent scanning during DHCP process
 2012-12-06 10:44:03 -08:00
The Android Automerger
b97dcaa74c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-06 10:39:19 -08:00
Irfan Sheriff
46e3807952 am c602187e: Merge "Prevent scanning during DHCP process" 
* commit 'c602187e51aa6e8c46bffa5fb2603e368d83ea95':
  Prevent scanning during DHCP process
 2012-12-06 10:39:04 -08:00
Jeff Sharkey
4bef5ac8c7 Merge "Wire KEYCODE_SYSRQ up to take screenshot." 2012-12-06 09:35:40 -08:00
Glenn Kasten
f94942f1b9 Merge "Import only what's needed" 2012-12-06 08:37:37 -08:00
Nick Kralevich
d1654e17d4 Merge "Remove duplicate AndroidManifest.xml entries." 2012-12-06 08:35:36 -08:00
Andreas Huber
bb2985aa0e am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev 
* commit '683028ca0dab7b5cf7afff4501c2372350231bae':
  Make it clear that non-optional MediaFormat keys are required
 2012-12-06 08:06:17 -08:00
Andreas Huber
683028ca0d Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev 2012-12-06 08:04:44 -08:00
Satoshi Kataoka
5bb4ee6d38 Fix an issue on changing the keyboard locale between spellchecking supported language to non-supported language 
Bug: 7658675
Change-Id: Ia2353f299506b5871e0104594e4486b6ab1ffa82
 2012-12-06 19:30:50 +09:00
Irfan Sheriff
ef96a43a3c Remove exposing dialog handling to apps 
This was a hidden API that has little value in being exposed due to
persistence now being supported on the platform.

The only use case for this is NFC, and we are going to add support
for that in official way

Change-Id: I20d97c8fd81e50fc610b4983b613e26ebaa72578
 2012-12-05 21:19:52 -08:00
Irfan Sheriff
1612e29826 Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 2012-12-05 20:33:37 -08:00
Jeff Sharkey
2991fa35a5 Wire KEYCODE_SYSRQ up to take screenshot. 
Change-Id: If7eee811d43ac88c7d206c61f264c3e5f63aa5b3
 2012-12-05 18:07:05 -08:00
Eric Laurent
fde16d5879 more fixes on safe volume warning message 
Fixes the following problems with safe headphone volume warning message:
- Do not display the warning dialog when screen is off.
- Use the same 3 second timeout as for the volume slider to dismiss the dialog.
- Do not dismiss the warning dialog when touching outside of the slider window
but inside the warning window.
- Disable the volume slider when the warning message is displayed.
- When setting volume directly (touching the volume slider), and the warning
is displayed, save the requested volume and apply it if acknowledged by the user.
- Do not display the warning message when restoring safe volume after 20h of
cumulative listenening

Bug 7658641.

Change-Id: Ib3d1315193a433dad918aa5df78fa071062b2394
 2012-12-05 17:59:39 -08:00
Fabrice Di Meglio
09329186ea am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev 
* commit 'b3b2922b10650551664659eadcf9c43cf9628974':
  Fix bug #7649607 Hebrew text is cut off in Settings
 2012-12-05 17:20:51 -08:00
Fabrice Di Meglio
b3b2922b10 Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev 2012-12-05 17:17:35 -08:00
Glenn Kasten
a501b5b8d5 AudioTrack error checks 
getMinBufferSize():
  Simplify native_get_min_buff_size error checks and handle more errors.

setPlaybackHeadPosition():
  Disallow for streaming mode [underlying AudioTrack C++ requires this].
  Disallow setPlaybackHeadPosition before write().
  Remove unnecessary synchronization around native_set_position().

setLoopPoints():
  As setLoopPoints() is effectively a variant of setPlaybackHeadPosition(), do the same error checks.

write():
  Don't set "write completed" state if write() parameters are invalid or native write fails.
  It was setting "write completed" flag too early, and ignoring native write return value.
  Detect integer overflow.

reloadStaticData():
  Disallow reloadStaticData() before write().

Change-Id: Iec36fc0ea67095e18a2c238b148dad5545c102c1
 2012-12-05 17:08:48 -08:00
Jim Miller
946f6ab440 am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev 
* commit '9819a61745b8eea3b3b7fa3af2c1ba017192cc36':
  Fix password field focus in keyguard
 2012-12-05 16:42:13 -08:00
Jim Miller
9819a61745 Merge "Fix password field focus in keyguard" into jb-mr1.1-dev 2012-12-05 16:37:52 -08:00
Winson Chung
a1bc0979a8 am 0db59a85: Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" 
* commit '0db59a856f9b4a6ae53854a88fea3a3675d572fd':
  Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
 2012-12-05 16:35:01 -08:00
Glenn Kasten
2b0b6596e4 Merge "Replace run-time modes by compile-time constants" 2012-12-05 16:33:58 -08:00
Nick Kralevich
a170bb81d5 Remove duplicate AndroidManifest.xml entries. 
The automerger added the entries twice...

Change-Id: I7910cb2126b339b0c8aee11051db1a2de8ae26ae
 2012-12-05 16:11:42 -08:00
Winson Chung
0db59a856f Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" 
This reverts commit 6cbc2e81742039969e081a9eed02060fb8789e25.
 2012-12-05 16:04:23 -08:00
Glenn Kasten
9c1d2de177 Merge "Make mInitializationLooper final" 2012-12-05 15:44:07 -08:00
Glenn Kasten
4e71faec0c Merge "Simplify throw statements" 2012-12-05 15:35:39 -08:00
Glenn Kasten
0fc11dd059 Merge "Remove redundant AudioTrack. qualifiers" 2012-12-05 15:28:06 -08:00
Glenn Kasten
df3cb52798 Remove redundant AudioTrack. qualifiers 
Symbols of the current class don't need to be qualified.

Change-Id: Ic89ce568771165d01d4b5bcf835c591ca0b86541
 2012-12-05 15:24:40 -08:00
Fabrice Di Meglio
a4884a12a1 am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 
* commit '0f3af41fbc2845c61676d3dac2c73a10b434be33':
  Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
 2012-12-05 15:20:28 -08:00
Fabrice Di Meglio
0f3af41fbc Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 2012-12-05 15:17:35 -08:00
Jim Miller
42df15e93d Fix password field focus in keyguard 
This fixes a bug introduced in Change-Id: I34b7db402401a824f463d35d7546c05dc2979243 where
the top-most view was allowed to capture focus in order to ensure the device handled volume
key events.

This resolves the issue by restoring previous behavior and ensures we still handle media keys,
regardless of focus.

Fixes bug 7676996

Change-Id: Id2d1200be81640e4b4b7b5e3a0af099d6fc2d259
 2012-12-05 15:15:00 -08:00
Jeff Sharkey
1fad16a635 am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit '3757e234d747b2257be1a2a830b9976177a6bcfd':
  Fix baseline alignment of notification times.
 2012-12-05 14:58:15 -08:00
Jeff Sharkey
3757e234d7 Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 2012-12-05 14:54:00 -08:00
Andreas Huber
4df82703a7 Make it clear that non-optional MediaFormat keys are required 
Also mark KEY_CHANNEL_MASK optional.

Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
related-to-bug: 7623602
 2012-12-05 14:28:22 -08:00
Victoria Lease
bc36b52372 am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 
* commit '7b0855715bc6cb14e3ca67d815915d2172f0bc12':
  DO NOT MERGE Adjust update interval when expiring location requests.
 2012-12-05 14:06:33 -08:00
Victoria Lease
7b0855715b Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 2012-12-05 14:03:28 -08:00
Laurent Tu
578081f9da Move location provider lib to frameworks/ex - 1 
Move location provider lib to frameworks/ex so it can be re-used in
GmsCore.

This is the frameworks/base part of the change (1).

Change-Id: Ifc31a6809876e9c9afb6ed841b66cf06de7e8964
 2012-12-05 13:57:01 -08:00
The Android Open Source Project
9950edcdcf am 08500d57: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '08500d5741ae5b21a397957cfb441787f0224d77':
 2012-12-05 13:00:59 -08:00
Amith Yamasani
c1493e1a01 am 368ee53f: am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit '368ee53f25cdff7ea89293d2cc81e95816919369':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 13:00:41 -08:00
Andreas Huber
8435d0e8ff Merge "Make it clear that non-optional MediaFormat keys are required" 2012-12-05 12:48:12 -08:00
Scott Main
23d8835dc1 am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit 'ab3a5d944eb5b39ed00f3422cee691570e05a3ce':
  docs: remove minsdkversion for clarity
 2012-12-05 12:30:36 -08:00
Dirk Dougherty
e875e9e0d8 am 6350cfb5: am 6a3ad968: am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '6350cfb529b30af88a2bff42962ab111a0cf137b':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-05 12:28:58 -08:00