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

97456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
012cfb245e am a4ff88cf: am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit 'a4ff88cf579cc336d54e9d7d8107d90af90bcf98':
  Fix baseline alignment of notification times.
 2012-12-06 23:22:16 -08:00
Victoria Lease
bdcef16b2b am ad5814b5: (-s ours) am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 
* commit 'ad5814b5b118801a6de5147119e58d7494383bce':
  DO NOT MERGE Adjust update interval when expiring location requests.
 2012-12-06 23:22:13 -08:00
Scott Main
cca13f1370 am 1a10de0f: am 23d8835d: am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit '1a10de0f6be13dcb3630ef1bec86ae0ff6a035e4':
  docs: remove minsdkversion for clarity
 2012-12-06 23:22:09 -08:00
Craig Mautner
ca3088cee8 am 29d4484d: am e771f3a6: am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev 
* commit '29d4484dd822d7781da4170f907b8a020eb3e1d0':
  Fix NPE when showing Toast from system process.
 2012-12-06 23:22:05 -08:00
Chris Craik
95a38b92a0 am a9877672: am 780a53df: am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev 
* commit 'a98776723f12ca1cbe6a8d181a49f179dfd23abd':
  Defer process mode upon draw
 2012-12-06 23:21:58 -08:00
Adam Hampson
002221d34a am fd0b2587: am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up 
* commit 'fd0b25875c3fe005329d412a2500da1951ff6a7b':
  EthernetDataTracker: Start DHCP on Link Up
 2012-12-06 23:21:54 -08:00
Jeff Sharkey
a4ff88cf57 am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit '1fad16a6353f912168b130a9e595ac4540487827':
  Fix baseline alignment of notification times.
 2012-12-06 18:59:06 -08:00
Victoria Lease
ad5814b5b1 am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 
* commit 'bc36b52372be154994f19a9e767184b2d6b4783a':
  DO NOT MERGE Adjust update interval when expiring location requests.
 2012-12-06 18:59:01 -08:00
Scott Main
1a10de0f6b am 23d8835d: am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit '23d8835dc112ef0c65fac41cf1a1a00cb6bc776d':
  docs: remove minsdkversion for clarity
 2012-12-06 18:58:31 -08:00
Craig Mautner
29d4484dd8 am e771f3a6: am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev 
* commit 'e771f3a67cbca9976de6b5df6088f6c007df2914':
  Fix NPE when showing Toast from system process.
 2012-12-06 18:58:24 -08:00
Chris Craik
a98776723f am 780a53df: am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev 
* commit '780a53dfb5176165286ff4f1483b408e28ad6eb7':
  Defer process mode upon draw
 2012-12-06 18:58:20 -08:00
Adam Hampson
fd0b25875c am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up 
* commit '6a9d57617a9b502c65d62f053ad8bd0309afdc24':
  EthernetDataTracker: Start DHCP on Link Up
 2012-12-06 18:58:10 -08:00
Tim Murray
906380a876 Merge "add filters from Gallery to ImageProcessing" 2012-12-06 18:06:25 -08:00
Tim Murray
d7940c89e8 add filters from Gallery to ImageProcessing 
Change-Id: Iaf90f4a9468adde4bc8d94ec3ceed41846f424d0
 2012-12-06 17:19:54 -08:00
Glenn Kasten
28d4cf50e7 Merge "AudioTrack error checks" 2012-12-06 16:34:48 -08:00
Stephen Hines
afa528e438 Merge "Fix app bug related to same input/output bitmap." 2012-12-06 15:22:44 -08:00
Stephen Hines
b6d04f84c3 Fix app bug related to same input/output bitmap. 
Due to our new bitmap storage optimization, we can't reuse the same
bitmap as input and output safely (since we modify the output directly).
This change updates ImageProcessing to appropriately create a distinct
output Bitmap Allocation and actually use it.

Change-Id: Iecf6c2d203bd1c370b8d0a9fb7e69b419d2eb69b
 2012-12-06 15:03:21 -08:00
Glenn Kasten
91c7bc2a8d Merge "Allow more APIs before write in static buffer mode" 2012-12-06 13:48:34 -08:00
Irfan Sheriff
42b1b564b6 Merge "Remove exposing dialog handling to apps" 2012-12-06 13:31:36 -08:00
Glenn Kasten
e1a2c9f944 Merge "Use the utility logging methods and single tag" 2012-12-06 12:47:17 -08:00
Laurent Tu
8d89388844 Merge "Move location provider lib to frameworks/ex - 1" 2012-12-06 12:42:30 -08:00
Glenn Kasten
ee88bc8ab9 Merge "Document that ByteBuffer position not updated" 2012-12-06 12:00:44 -08:00
Glenn Kasten
678210251c Merge "Remove dead method native_get_session_id()" 2012-12-06 11:41:34 -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
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
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
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
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
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
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
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
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
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