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

84563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
c89cb7cde2 am c67fb6c3: am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'c67fb6c39e75a08e50977e143d7ae7bd11e2604c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:20:57 -07:00
Jean-Baptiste Queru
c67fb6c39e am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:18:20 -07:00
The Android Open Source Project
73839a69ab am 7a647522: am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '7a6475220dbba9679fc15ef3fa92cd4f9f064615':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-09-06 09:18:00 -07:00
Jean-Baptiste Queru
657dba9e66 am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:16:09 -07:00
The Android Open Source Project
7a6475220d am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '1d9c5d8f18b7530c1e72fe86109707cddc198dbd':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-09-06 09:13:45 -07:00
Martijn Coenen
67ad3e98e3 am 32ac1e14: Fix NPE in NdefRecord parser. 
* commit '32ac1e142c4a0f3529c49cde433ae5e22f84b1d6':
  Fix NPE in NdefRecord parser.
 2012-09-06 09:13:43 -07:00
Michael Jurka
03f9eaf9b9 am 4848f42f: Merge "Fixing issue where recents items would go dim" into jb-mr1-dev 
* commit '4848f42f65082340b98da2628761e59567d19d9d':
  Fixing issue where recents items would go dim
 2012-09-06 09:13:39 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:12:17 -07:00
Martijn Coenen
32ac1e142c Fix NPE in NdefRecord parser. 
Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
 2012-09-06 17:13:38 +02:00
The Android Open Source Project
1d9c5d8f18 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746
 2012-09-06 08:08:54 -07:00
Jean-Baptiste Queru
bb60bc2602 Merge "Musicplayer application can not display DRM files of internal storage." 2012-09-06 07:21:00 -07:00
Michael Jurka
4848f42f65 Merge "Fixing issue where recents items would go dim" into jb-mr1-dev 2012-09-06 01:13:59 -07:00
Jim Miller
e2c68c10a7 am 5830cb28: Cosmetic code changes to face unlock after review. 
* commit '5830cb2882b38182f414423ae1bc901cc27767cc':
  Cosmetic code changes to face unlock after review.
 2012-09-05 18:57:56 -07:00
Jim Miller
5830cb2882 Cosmetic code changes to face unlock after review. 
Change-Id: I6e4face14c1585ed7123ae9c055b5ac3ccc86395
 2012-09-05 18:54:18 -07:00
Jim Miller
d67780634e am d2d4a645: Merge "Keep local reference to KeyguardStatusViewManager so it doesn\'t get GC\'d" into jb-mr1-dev 
* commit 'd2d4a6456579ea460afb6baf3a4e7cb2a27d55fb':
  Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd
 2012-09-05 18:28:13 -07:00
Jim Miller
d2d4a64565 Merge "Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd" into jb-mr1-dev 2012-09-05 18:25:43 -07:00
Jim Miller
6212cc0d3f Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd 
This fixes a bug where we'd stop updating the status view in keyguard
because KeyguardStatusViewManager had no references.

It also fixes a bug where KeyguardUpdateMonitor wasn't removing objects
because objects were being compared with WeakReferences rather than the
content of the WeakReferences.

Bug:7095359

Change-Id: I2d9df6097b2270655ad3662bcf7a6757e0515363
 2012-09-05 18:14:29 -07:00
Jim Miller
dab6deb6f4 am e7376e2c: Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev 
* commit 'e7376e2c2c4358c18578aefe861cf06573e2575d':
  Initial pass at re-enabling face unlock in new keyguard.
 2012-09-05 16:56:05 -07:00
Jim Miller
e7376e2c2c Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev 2012-09-05 16:53:12 -07:00
Jim Miller
000464ac01 Initial pass at re-enabling face unlock in new keyguard. 
Change-Id: I187629f9c4bfd810f11c73416db6e41b56f09a45
 2012-09-05 16:12:26 -07:00
Selim Gurun
a106ab46ae am 18e87680: Merge "remove defunct javascript interface" into jb-mr1-dev 
* commit '18e876806718e28edaa3cd9bb0262a9b400bc82b':
  remove defunct javascript interface
 2012-09-05 15:06:51 -07:00
Selim Gurun
18e8768067 Merge "remove defunct javascript interface" into jb-mr1-dev 2012-09-05 15:04:07 -07:00
Jason Sams
4017f49674 am 6d617c2d: Merge "Stabilize perf data." into jb-mr1-dev 
* commit '6d617c2ddd848985fb98e0e54dc7f6234d814b7c':
  Stabilize perf data.
 2012-09-05 13:53:28 -07:00
Jason Sams
7db45afbe7 am 3e777c79: Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev 
* commit '3e777c79707d6c65e41ecd5a9b0e8f252ceafc90':
  Add ColorMatrix Intrinsic.
 2012-09-05 13:51:44 -07:00
Jason Sams
6d617c2ddd Merge "Stabilize perf data." into jb-mr1-dev 2012-09-05 13:50:36 -07:00
Jason Sams
3e777c7970 Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev 2012-09-05 13:48:58 -07:00
Jim Miller
011071f3f4 am 27230f07: Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev 
* commit '27230f076a0f3a3e461405cc61088fa306d9847c':
  Better flow for SIM PIN/ SIM PUK screens in keyguard.
 2012-09-05 13:47:35 -07:00
Jim Miller
27230f076a Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev 2012-09-05 13:45:30 -07:00
Michael Jurka
14895405c1 Fixing issue where recents items would go dim 
Bug: 6772614
Change-Id: I2f57f001d91d6cb445c58ac705e6c3ad1fa70dd3
 2012-09-05 13:40:50 -07:00
Jason Sams
76fb2973b9 Stabilize perf data. 
Change-Id: I75fb31b1bb6e6a7a5a82b86fd4a6639dd328ceaa
 2012-09-05 13:18:43 -07:00
Jim Miller
529c3e2b65 am 9ca26e43: Merge "Don\'t depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 
* commit '9ca26e43652b516f6d38dc92120d802b5e8bfde4':
  Don't depend on LockPatternUtils to get DevicePolicyManager
 2012-09-05 12:51:45 -07:00
Jim Miller
9ca26e4365 Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 2012-09-05 12:49:31 -07:00
Dmitry Shmidt
096f414d94 am 91a65b53: Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev 
* commit '91a65b5339e1e43d56d123003e7112a5223e2f75':
  Restore original default Wifi sleep policy (always)
 2012-09-05 12:41:33 -07:00
Daniel Sandler
56f97a9b59 am fd5494b8: Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev 
* commit 'fd5494b8ef91e8a909622c3bf45dac7537254b41':
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
 2012-09-05 12:41:30 -07:00
Dmitry Shmidt
91a65b5339 Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev 2012-09-05 12:39:23 -07:00
Daniel Sandler
fd5494b8ef Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev 
* changes:
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
 2012-09-05 12:38:25 -07:00
Jean-Baptiste Queru
ee2175c75b am ec098efc: am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit 'ec098efcb11c4f4a12e7d3e44995536ef1eb7c1b':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:37:18 -07:00
Jean-Baptiste Queru
ec098efcb1 am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:36:04 -07:00
Dmitry Shmidt
8de24dca68 Restore original default Wifi sleep policy (always) 
BUG: b/7092819

Change-Id: I6ee6755fd04df2f0169f8602e60542c3591038f3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2012-09-05 12:35:09 -07:00
Jean-Baptiste Queru
79a37c4539 am f389f282: resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
* commit 'f389f2820c731b2b938a7057cde9dc11d87bcbe3':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:34:40 -07:00
Jim Miller
f73fbf79a1 Don't depend on LockPatternUtils to get DevicePolicyManager 
This fixes a crash where LockPatternUtils hasn't been set yet and
keyguard attempts to get the device policy for widgets.

This change breaks the dependency by getting a handle to DPM directly.

Bug:7109723

Change-Id: Iecae91474358821ebd30456648377253864c35cf
 2012-09-05 12:23:06 -07:00
Jean-Baptiste Queru
f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
 2012-09-05 12:21:50 -07:00
Jean-Baptiste Queru
342c6bc8e5 am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '540995555505486074e9652a9c682bdf6e3056c5':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:12:56 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
8668323234 am 5575e97c: Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 
* commit '5575e97cea2bbaf0f4f1c3445e28cff2759d4f74':
  Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
 2012-09-05 12:06:15 -07:00
Scott Main
08cc303a2c am f53c5711: am b693f6a9: am 8f58d381: older not lower 
* commit 'f53c571144f74488a16d57cae260a857c00769b1':
  older not lower
 2012-09-05 12:04:23 -07:00
Fabrice Di Meglio
5575e97cea Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 2012-09-05 12:03:32 -07:00
Scott Main
f53c571144 am b693f6a9: am 8f58d381: older not lower 
* commit 'b693f6a94ca2fa6bd4bba94363112bfd1aeb70ee':
  older not lower
 2012-09-05 12:01:14 -07:00