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

93705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
5196cb6fa0 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ib7a3e7b3af9ef848b763cf498c6757ad5658fc80
 2012-11-29 15:41:04 -08:00
Dianne Hackborn
4d78abfca7 Always report user switched after unfreezing screen. 
Change-Id: I58172896892a07e72a3430e56e4d2944d388c7c9
 2012-11-29 15:10:18 -08:00
Robert Ly
8f0f951418 am 8569af30: am 5915f61e: am 830b23b7: docs: gms javadocs 
* commit '8569af3011d0e3f74bb82a869c05879e1493ac07':
  docs: gms javadocs
 2012-11-29 14:28:59 -08:00
Robert Ly
d88e1a1f78 am a93d0e09: am 64208d23: am aae17137: docs: update gms toc and landing pages 
* commit 'a93d0e09301b8783bafc486231519385e85a28fe':
  docs: update gms toc and landing pages
 2012-11-29 14:28:55 -08:00
Robert Ly
8587f04cae am 206979c9: am 8f1371af: am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev 
* commit '206979c9ac13bec6bc550946a410ace94b8ca343':
  docs: fix bug 7628699
 2012-11-29 14:28:37 -08:00
Colin Cross
372bb2380d am 418af932: am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev 
* commit '418af9323fcb2363636bf4072c230a8adebfcc86':
  trigger kernel blocked stack trace on system server watchdog
 2012-11-29 14:28:33 -08:00
Dianne Hackborn
84ea428d24 am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev 
* commit 'ed8c323a6c776540de356d6fc7d902cc5916fef5':
  Fix issue #7585876: When changing the font settings, the movie...
 2012-11-29 14:28:24 -08:00
John Spurlock
a3aef5ff62 am 43658bae: am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev 
* commit '43658bae9cdb5307d54fa36f3e57def9d0991150':
  Fix multiuser bug in StatusBarManagerService.
 2012-11-29 14:28:18 -08:00
John Spurlock
721aaead07 am 1428384c: am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev 
* commit '1428384c6217c843169e233dc934d5fcbf18a792':
  Fix for navbar back/home appearing in keyguard (multiuser).
 2012-11-29 14:28:15 -08:00
Scott Main
35837ebb0c am 3aabc564: am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev 
* commit '3aabc564253b9dd53f18c7111767190b22109cb4':
  docs: update landing page for Google Services
 2012-11-29 14:28:11 -08:00
Daniel Sandler
e196eb7642 am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit 'a8a63dd7d9d49930b70371319b5712aed17a9c4c':
  Flush the clock format when the locale changes.
 2012-11-29 14:28:07 -08:00
Victoria Lease
a5fa049562 am 4b77660b: am 7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev 
* commit '4b77660b38cfff2ffb67c15db4c9e20adaac41d7':
  clarify Geofence.createCircle() param ranges
 2012-11-29 14:28:04 -08:00
Christopher Tate
45972e7cf0 am fac7b0a6: am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt 
* commit 'fac7b0a60306d851d903730ccc408a0272e866db':
  Cache resource ID lookups in aapt
 2012-11-29 14:27:56 -08:00
Craig Mautner
d08fc86964 am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev 
* commit '4317b3418b144c162634ec647df76a484ac35612':
  Fix math errors causing black screen. DO NOT MERGE
 2012-11-29 14:27:43 -08:00
zzy
de95a276e7 am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit '3fe63ce4a97a448e6f91754b6b9fa80eecead40b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:27:33 -08:00
Fabrice Di Meglio
cd91470aad am 146b1290: am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 
* commit '146b129075bfe879aa09888744d1ba8de06f331a':
  Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
 2012-11-29 14:27:05 -08:00
Adam Powell
8912a72cb2 am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '462633695774a3cfd84b5c729266d039ec686a64':
  Fix time-related ScaleGestureDetector methods
 2012-11-29 14:27:01 -08:00
Adam Powell
2a1f11e975 am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:26:57 -08:00
Adam Powell
1126c2a693 am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '76ee9a9c171d08802b44883be54b32dc31aa680b':
  Import assets from UX
 2012-11-29 14:26:49 -08:00
Dianne Hackborn
b2e18e91ec am b443ddbb: am 2c41c4a2: Fix build. 
* commit 'b443ddbbc7f1c7ed2d30310f80323cd4a5bf3e8d':
  Fix build.
 2012-11-29 14:26:45 -08:00
Dianne Hackborn
5007dea96e am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
  Cleaner initial boot.
 2012-11-29 14:26:37 -08:00
Chris Craik
c0da873ee2 am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev 
* commit 'a9473881eb066b41ea2fb3389b5c0031c2ab4f38':
  Use the same interrupt/resume logic for all functor calls
 2012-11-29 14:26:33 -08:00
Adam Cohen
20b9edd805 am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:26:29 -08:00
Robert Greenwalt
81cf3abdd5 am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '10659cb1be0059353f9e2ae64c7cfcc9ec312ba3':
  Secure a handful of framework broadcasts
 2012-11-29 14:26:20 -08:00
Irfan Sheriff
61b00239dd am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit '0cec3de3374a861497ff7eeada94865e85896971':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-29 14:26:04 -08:00
Fabrice Di Meglio
52c3833e20 am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
 2012-11-29 14:25:40 -08:00
Robert Ly
8569af3011 am 5915f61e: am 830b23b7: docs: gms javadocs 
* commit '5915f61e8b10e2a89d302f3c9bf2104c4abe1c07':
  docs: gms javadocs
 2012-11-29 14:23:35 -08:00
Robert Ly
5915f61e8b am 830b23b7: docs: gms javadocs 
* commit '830b23b76676542cbcb5ef3c60c869460d4c5466':
  docs: gms javadocs
 2012-11-29 14:22:13 -08:00
Robert Ly
a93d0e0930 am 64208d23: am aae17137: docs: update gms toc and landing pages 
* commit '64208d23c95c16d1fb41b4dffdce554c198c5ee1':
  docs: update gms toc and landing pages
 2012-11-29 14:19:51 -08:00
Robert Ly
64208d23c9 am aae17137: docs: update gms toc and landing pages 
* commit 'aae171371b044d4efe4b58589f3b04f000016cec':
  docs: update gms toc and landing pages
 2012-11-29 14:17:31 -08:00
Robert Ly
830b23b766 docs: gms javadocs 
Change-Id: Ibcae03cab861c90a589f39a860889a3f4e6a55ad
 2012-11-29 14:11:28 -08:00
Colin Cross
b36ed85c40 trigger kernel blocked stack trace on system server watchdog 
Bug b/7638530 may be caused by a kernel deadlock when killing
processes under low memory conditions.  Write to /proc/sysrq-trigger
to get a kernel log of blocked tasks before killing the system server.

Bug: 7638530
Change-Id: I60df324ad4affdadbf13650099dc4dfb38722420
 2012-11-29 14:00:55 -08:00
Daniel Sandler
a8ef3b044e Suppress quick settings if setup has not been completed. 
The button was already hidden, but there are lots of other
ways to get into QS that should check for USER_SETUP.

Bug: 7638795
Change-Id: Ib6c48fc02e833670768e7dc76e25c38097b88c18
 2012-11-29 16:22:37 -05:00
Michael Jurka
fff5614cae Disable adding keyguard widgets until setup is done 
Bug: 7504154

Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
 2012-11-29 13:15:39 -08:00
Robert Ly
aae171371b docs: update gms toc and landing pages 
Change-Id: I2d55026d492356b70de2071c96786b6dadb5938a
 2012-11-29 13:14:02 -08:00
Robert Ly
206979c9ac am 8f1371af: am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev 
* commit '8f1371aff392debf345027874f5fad4354137eed':
  docs: fix bug 7628699
 2012-11-29 13:07:02 -08:00
Robert Greenwalt
b8da0376f2 Secure a handful of framework broadcasts 
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.

bug:7622253
(cherry picked from commit 47918ae3b4e7ebb54711884e9ff9d0300591ab8b)

Conflicts:

	core/res/AndroidManifest.xml

Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495
 2012-11-29 13:06:23 -08:00
Robert Ly
8f1371aff3 am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev 
* commit '64e4ed8d67376e519c2d0d5e70a1375f8a8760eb':
  docs: fix bug 7628699
 2012-11-29 13:04:23 -08:00
Robert Ly
64e4ed8d67 Merge "docs: fix bug 7628699" into jb-mr1-dev 2012-11-29 13:02:09 -08:00
Makoto Onuki
1b86d75d31 Remove unused IExtendedNetworkService 
It was used in the cupcake era for docomo.  Is not used anymore.

Bug 7633569

Change-Id: I2ec826fc9a70d261a340957a937ed4c9f8e67c5c
 2012-11-29 12:52:51 -08:00
Colin Cross
418af9323f am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev 
* commit '05db19bc55962374812775bf7d980d83ca4f6c3e':
  trigger kernel blocked stack trace on system server watchdog
 2012-11-29 12:49:46 -08:00
Colin Cross
05db19bc55 Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev 2012-11-29 12:47:54 -08:00
Scott Main
18eeb4574e am d294d429: am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit 'd294d429f90ea7d442fa9cd0f0c71e9292a36016':
  docs: revisions to gps landing pages
 2012-11-29 12:45:30 -08:00
Dirk Dougherty
bea4bb716e am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 
* commit 'a539807a7c50948eec99b27e2d4d05da208ae3f1':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-29 12:45:26 -08:00
Brian Colonna
eceef837e3 am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-29 12:45:18 -08:00
Zhihai Xu
aaa453dbbd am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit '2c7dac19dd2cab68587cd129b45ad593f7bfdc44':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-29 12:45:09 -08:00
Colin Cross
5df1d871fe trigger kernel blocked stack trace on system server watchdog 
Bug b/7638530 may be caused by a kernel deadlock when killing
processes under low memory conditions.  Write to /proc/sysrq-trigger
to get a kernel log of blocked tasks before killing the system server.

Bug: 7638530
Change-Id: I60df324ad4affdadbf13650099dc4dfb38722420
 2012-11-29 12:44:09 -08:00
Daniel Sandler
c08cd02649 Add constant for Daydream settings. 
Bug: 7480927
Change-Id: I383170c6c543b5ffe81568d273389585498d369b
 2012-11-29 15:24:39 -05:00
Daniel Sandler
fe0e1e445f Only show "charging" if the battery is really charging. 
If there's a charge problem (battery health/temperature out
of spec, or low charging current), the lockscreen and status
bar should not indicate that charging is occurring.

(Previously we showed "Charging" and a lightning bolt any
time the device was plugged in.)

Bug: 7509976
Change-Id: I27ec0e2cec1307fbc6ef262dd5181a4db6d3bed0
 2012-11-29 15:11:50 -05:00