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

114915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
f534dc6c36 am 94bf4d69: am 0156a379: Merge "Allow saving to Downloads." into klp-dev 
* commit '94bf4d69f2e59a0bb62c5d1829e4cf9be5a67579':
  Allow saving to Downloads.
 2013-09-24 10:22:53 -07:00
Amith Yamasani
d94c31d13a am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev 
* commit '32a2775e529d13dfd34273a3b4af5151435720b2':
  Unmarshall PFDs properly when hand-crafting interface stubs
 2013-09-24 10:22:50 -07:00
Katie McCormick
4ba9c875de am 4418f660: am ba0fa9ce: am 50756ccc: am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs 
* commit '4418f660b486a46f205992bf8580a724ad2a76e9':
  New Scheduling class.
 2013-09-24 10:22:46 -07:00
John Spurlock
93c672e695 am 237b8428: am fac17cc7: Merge "Introduce transparent bars to the keyguard." into klp-dev 
* commit '237b84287e1fe135af957775f53a6be999b618a2':
  Introduce transparent bars to the keyguard.
 2013-09-24 10:22:43 -07:00
Ken Sumrall
e93eeece2c am 757dcfc3: am d3fbba15: Merge "Upload fsck logs to the dropbox when error found" into klp-dev 
* commit '757dcfc37236c7dd5ef13a81ad9dac5d47ef7fe1':
  Upload fsck logs to the dropbox when error found
 2013-09-24 10:22:39 -07:00
Dianne Hackborn
e941dee66f am 8db6517e: am ba0abd0a: Merge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev 
* commit '8db6517e846a6ee43d4ce19f7b5b2c5a351a2122':
  Fix issue #10876433: java.lang.IllegalStateException in...
 2013-09-24 10:22:34 -07:00
Derek Sollenberger
5380709c78 am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev 
* commit 'fad41c8fd1024a8257bdced18dbcbc9cd67e407a':
  Fix Java API error where requesting another style for a provided family fails
 2013-09-24 10:22:29 -07:00
Dianne Hackborn
a0faa41254 am dc655c0e: am 4bf0fcef: Merge "Work on issue #10759595: preferred tag doesn\'t prevent..." into klp-dev 
* commit 'dc655c0e0742bcc4834773a8aacb8b7d67a73aad':
  Work on issue #10759595: preferred tag doesn't prevent...
 2013-09-24 10:22:25 -07:00
Craig Mautner
f420a76e62 am c96218a0: am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev 
* commit 'c96218a0575f7f5816104d38365c68a21c7b9ea6':
  Ensure that activities behind keyguard are paused.
 2013-09-24 10:22:22 -07:00
Vinit Deshapnde
ad93dc7f5c am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev 
* commit '10914a23f71b42a2b9d08a0199689d84117d5e0c':
  Allow yet another combination of key management options
 2013-09-24 10:22:18 -07:00
Matthew Williams
9f584e576f am 05b51688: (-s ours) am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 
* commit '05b51688f656700f3b5a06ea9664c88215a07494':
  fix deadlock caused by clearAllBackoffs in SSE
 2013-09-24 10:22:14 -07:00
Lajos Molnar
283fe37aa2 WebVttRenderer: allow BOM at beginning of a WebVTT file. 
This is part of the spec.

Change-Id: I61ccc259c0b9d3a2bc4273925665d107b0c89c62
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10900755
 2013-09-24 10:13:43 -07:00
Craig Mautner
ac56514ea7 Fix method for determining focused window. 
Method had been rewritten to be task-based and there were errors
when a task had no apptokens. New version is much easier to
maintain.

Maybe fixes bug 10689184.

Change-Id: I5e4c8447a33a4f5686296c20b9f9fe302c9ae49f
 2013-09-24 09:01:48 -07:00
Jean-Michel Trivi
e783ffab89 am bc05918c: Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev 
* commit 'bc05918c88fe9450008ba3adf6caed6afa46550b':
  Public API for peak and RMS monitoring through the Visualizer effect
 2013-09-24 08:51:48 -07:00
Jean-Michel Trivi
bc05918c88 Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev 2013-09-24 15:44:56 +00:00
Baligh Uddin
4452a3f591 am 89104790: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '891047901f025fd031346c29643709526d88aba8':
  Import translations. DO NOT MERGE
 2013-09-24 08:00:20 -07:00
Baligh Uddin
132f50cddf am 71a5f3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '71a5f3cefef8269dba2dcf86d9ea7eee3c88dcca':
  Import translations. DO NOT MERGE
 2013-09-24 08:00:17 -07:00
Baligh Uddin
0c47508cf3 am 87ac87a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '87ac87a5e504b4e3d2a8fed9a6adb66d2d775b60':
  Import translations. DO NOT MERGE
 2013-09-24 08:00:15 -07:00
Baligh Uddin
2ff9b6ad57 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:59:34 +00:00
Baligh Uddin
891047901f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:59:27 +00:00
Baligh Uddin
872b036270 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:59:16 +00:00
Baligh Uddin
71a5f3cefe Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:59:07 +00:00
Baligh Uddin
e0a2e43a13 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:58:12 +00:00
Baligh Uddin
87ac87a5e5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:58:07 +00:00
Martin Kosiba
dc7053be9f am 4e31b804: Merge "Update WebView documentation section about zoom." into klp-dev 
* commit '4e31b8046da047d5286532776d6d169e09d21ce5':
  Update WebView documentation section about zoom.
 2013-09-24 02:52:20 -07:00
Martin Kosiba
4e31b8046d Merge "Update WebView documentation section about zoom." into klp-dev 2013-09-24 09:49:22 +00:00
Svetoslav
b5f180608d Multiple printer discovery session instances and other bugs. 
1. The fused printers provider was dropping on the floor received printers
    if it was not active. It is in fact a loaded and if not active it should compute
    the printers and not deliver them until activated. This fixes an issue where
    opening the print dialog, then enabling a print service results in the printers
    reported by the service not showing up in the print dialog.

2. Printer discovery session was created twice which leads to incorrect behavior
    as the pint system is designed around the contract that there is a single
    printer discovery session per service at a time. This was possible due to an
    incorrect initialization of a member variable resulting in double session creation
    when the print service is connected.

3. When a print service is enabled during discovery we did not use the correct
    condition to start printer discovery resulting in starting it all the time even if
    not needed. Also if some of the printers that had to be tracked are reported
    by the service just enabled (typically historical printers) we did not ask the
    service to start tracking them.

4. Removed some logging.

bug:10903343

Change-Id: I46c049471a4b099fc668df3aee2aaedc8d7786ac
 2013-09-23 23:41:12 -07:00
Zhijun He
ff704b63dd am 0d9fdc24: Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev 
* commit '0d9fdc245172bb5c46eb21094e384d95da1a46df':
  Camera2: replace EDQUOT with EUSERS
 2013-09-23 19:33:07 -07:00
Zhijun He
0d9fdc2451 Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev 2013-09-24 02:28:22 +00:00
Svetoslav
6c1ea4b937 am cace0382: am a9f97a0a: Merge "Page ranges not correct in come cases." into klp-dev 
* commit 'cace0382dd5233f75fb2201494a358d72dfd9256':
  Page ranges not correct in come cases.
 2013-09-23 19:04:04 -07:00
Dianne Hackborn
9ef68ecda5 am 8d4816d8: am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 
* commit '8d4816d8fc9c1acbf377e7ee50b9871c4b5b8028':
  Issue #10461551: KLP API Review: AppOpsManager
 2013-09-23 19:04:00 -07:00
Jim Miller
c8f00291f6 am 89e1fec9: Merge "Fit and finish for navbar camera affordance" into klp-dev 
* commit '89e1fec9af78b94cbafc21fe22a69213ae31a6fa':
  Fit and finish for navbar camera affordance
 2013-09-23 19:00:55 -07:00
Jim Miller
9c4c61d08e am 81f429e0: Merge "Enable RTL support in keyguard" into klp-dev 
* commit '81f429e097055079cd2a9c7875c1a5dbea0dea06':
  Enable RTL support in keyguard
 2013-09-23 19:00:46 -07:00
David Christie
f6a63c9244 am fe538cb6: Merge "Fix broken method WorkSource.set (names aren\'t applied)." into klp-dev 
* commit 'fe538cb60ea9032645e8bcdcb5ebbe5810626cff':
  Fix broken method WorkSource.set (names aren't applied).
 2013-09-23 19:00:33 -07:00
Svetoslav Ganov
5bf43d253c am 5dfccc3c: Merge "The current is printer not refreshed when selected." into klp-dev 
* commit '5dfccc3c0d142765b04f9cd8b2513a6b9db22426':
  The current is printer not refreshed when selected.
 2013-09-23 19:00:25 -07:00
Jean-Michel Trivi
b25f264052 am e9b0dd89: Merge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev 
* commit 'e9b0dd899a715531b7960909744fcf874c761118':
  Add audio level monitoring capabilities in Visualizer effect
 2013-09-23 19:00:22 -07:00
Dianne Hackborn
d79c8671ec am 2d4eee38: Merge "Implement issue #10895990: Better durations for proc stats" into klp-dev 
* commit '2d4eee38295e2cc65f280bf90580dccb5ef1d266':
  Implement issue #10895990: Better durations for proc stats
 2013-09-23 19:00:11 -07:00
Wink Saville
cda884d5c0 am d3890496: Merge "Add RIL_REQUEST_SET_INITIAL_ATTACH_APN." into klp-dev 
* commit 'd38904965d03e9e9b902b78cadfb8b7a799855a9':
  Add RIL_REQUEST_SET_INITIAL_ATTACH_APN.
 2013-09-23 19:00:06 -07:00
Jeff Sharkey
94bf4d69f2 am 0156a379: Merge "Allow saving to Downloads." into klp-dev 
* commit '0156a379e21621d2724635eb96f37a81efc7be06':
  Allow saving to Downloads.
 2013-09-23 19:00:01 -07:00
Amith Yamasani
32a2775e52 am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev 
* commit '85f77c2b8b46a52544ab9305a8c4cf9a36923013':
  Unmarshall PFDs properly when hand-crafting interface stubs
 2013-09-23 18:59:57 -07:00
Katie McCormick
4418f660b4 am ba0fa9ce: am 50756ccc: am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs 
* commit 'ba0fa9ce5ea81f87e2678f663a883827c2361b43':
  New Scheduling class.
 2013-09-23 18:59:49 -07:00
John Spurlock
237b84287e am fac17cc7: Merge "Introduce transparent bars to the keyguard." into klp-dev 
* commit 'fac17cc7b1e8c3b73a457c2d85e2f832461fb26e':
  Introduce transparent bars to the keyguard.
 2013-09-23 18:59:45 -07:00
Ken Sumrall
757dcfc372 am d3fbba15: Merge "Upload fsck logs to the dropbox when error found" into klp-dev 
* commit 'd3fbba15799cb69cd3b524a2d1fbf6d758f287a5':
  Upload fsck logs to the dropbox when error found
 2013-09-23 18:59:38 -07:00
Dianne Hackborn
8db6517e84 am ba0abd0a: Merge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev 
* commit 'ba0abd0abdaf3eedd42927eb5b51b202f0f348eb':
  Fix issue #10876433: java.lang.IllegalStateException in...
 2013-09-23 18:59:36 -07:00
Derek Sollenberger
fad41c8fd1 am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev 
* commit '5db1f5aaacf01e176f2463c212da72eaafc79165':
  Fix Java API error where requesting another style for a provided family fails
 2013-09-23 18:59:24 -07:00
Dianne Hackborn
dc655c0e07 am 4bf0fcef: Merge "Work on issue #10759595: preferred tag doesn\'t prevent..." into klp-dev 
* commit '4bf0fcef9296b53114e86490d79956986f8b93a6':
  Work on issue #10759595: preferred tag doesn't prevent...
 2013-09-23 18:59:13 -07:00
Craig Mautner
c96218a057 am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev 
* commit 'e14d0c211fb669f88c284af85c942135e834e498':
  Ensure that activities behind keyguard are paused.
 2013-09-23 18:59:05 -07:00
Vinit Deshapnde
10914a23f7 am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev 
* commit '662c326e5fc02fa11226de1267b7f60485f5638a':
  Allow yet another combination of key management options
 2013-09-23 18:59:02 -07:00
Matthew Williams
05b51688f6 am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 
* commit '75256476c87cc8c4f7e5124c9b944c37b2f51d3d':
  fix deadlock caused by clearAllBackoffs in SSE
 2013-09-23 18:58:55 -07:00
Svetoslav
cace0382dd am a9f97a0a: Merge "Page ranges not correct in come cases." into klp-dev 
* commit 'a9f97a0a58066a29391629da85ed25a8e876dd40':
  Page ranges not correct in come cases.
 2013-09-23 18:58:46 -07:00