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

114588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
af7968497e am 2d696ff9: am 76e6bcb8: Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev 
* commit '2d696ff910479457b0f01421c93f2f8516f64b13':
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
 2013-09-20 11:29:19 -07:00
Chet Haase
d0bcf4b76b am 6736d380: am bdb61865: Merge "Add equals() and hashcode() to SpannableString" into klp-dev 
* commit '6736d380b7d318f3af84294ae38a881e2dc54528':
  Add equals() and hashcode() to SpannableString
 2013-09-20 11:29:16 -07:00
Adam Lesinski
e6ed04a7ec am 2dc3c739: am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 
* commit '2dc3c7398b2d8965f8017bc25f2e9a29c6b83c3d':
  Ensures that CompatibilityInfo is always set in Resources
 2013-09-20 11:29:12 -07:00
Dianne Hackborn
2d696ff910 am 76e6bcb8: Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev 
* commit '76e6bcb8c6f8804c6e32d359ee464e7f288291a4':
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
 2013-09-20 11:24:52 -07:00
Chet Haase
6736d380b7 am bdb61865: Merge "Add equals() and hashcode() to SpannableString" into klp-dev 
* commit 'bdb6186580875982dd1a537b6c935922d0e62fe3':
  Add equals() and hashcode() to SpannableString
 2013-09-20 11:24:49 -07:00
Adam Lesinski
2dc3c7398b am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 
* commit 'ff5cbab50076baa06333b6ee05cc04c882a7ba13':
  Ensures that CompatibilityInfo is always set in Resources
 2013-09-20 11:24:46 -07:00
Dianne Hackborn
76e6bcb8c6 Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev 2013-09-20 18:23:08 +00:00
Chet Haase
bdb6186580 Merge "Add equals() and hashcode() to SpannableString" into klp-dev 2013-09-20 18:22:54 +00:00
Robert Greenwalt
12f6510170 am 032de6c6: am c237c204: Merge "Supsend/resume batched scans around dhcp." into klp-dev 
* commit '032de6c6294893045c0c17946b45800b5af47d60':
  Supsend/resume batched scans around dhcp.
 2013-09-20 11:22:40 -07:00
Robert Greenwalt
692af53a20 am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 11:22:35 -07:00
Scott Main
0216929e19 am 81c494b6: am 562ce888: am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '81c494b68046dbee464c7cc703595ecdb685723f':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 11:22:23 -07:00
Adam Lesinski
ff5cbab500 Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev 2013-09-20 18:22:17 +00:00
John Spurlock
812632b95b am d4c2b67e: am 560d2e46: Merge "Include starting windows in the sysui vis calculation." into klp-dev 
* commit 'd4c2b67ea6b084b8242ad2aa054c749e1f26d13b':
  Include starting windows in the sysui vis calculation.
 2013-09-20 11:22:10 -07:00
Maggie Benthall
ca4ffc599e am b0bd2bfd: am db93e1d7: Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 
* commit 'b0bd2bfdbc878d4f23e3277704e3c9a82b112381':
  UX compliance for CA Cert warning tile in QuickSettings
 2013-09-20 11:22:00 -07:00
Daniel Sandler
806fa829b4 am 0cc92983: am 4e6f752f: Put soundpooled sounds in the right place. 
* commit '0cc9298320fa6f018f0a2b7292057be46964c15c':
  Put soundpooled sounds in the right place.
 2013-09-20 11:21:56 -07:00
Jim Miller
bbfd7e3ca2 am aef89022: am 3855b99f: Fix the build - replace broken assets. 
* commit 'aef8902245bdde18a3bd168e8706cd1e009f4d24':
  Fix the build - replace broken assets.
 2013-09-20 11:21:29 -07:00
Jeff Sharkey
f97d4681d3 am 89dec7e6: am a9ce049d: Load RootInfo in background, invalidation. 
* commit '89dec7e6e9ab98141de89096ef052cb2c158c557':
  Load RootInfo in background, invalidation.
 2013-09-20 11:21:26 -07:00
Michael Jurka
20ce157923 am 48c52bea: am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev 
* commit '48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d':
  Fix default wallpaper dimensions
 2013-09-20 11:21:23 -07:00
Christopher Tate
cc5db25485 am 2e6eef65: am 3301f76b: Merge "Don\'t back up apps in the \'stopped\' state" into klp-dev 
* commit '2e6eef655f079536251ff030d38fb6480dd97a18':
  Don't back up apps in the 'stopped' state
 2013-09-20 11:21:18 -07:00
Jim Miller
3f943b1143 am f3d1ef00: am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev 
* commit 'f3d1ef00c571657bd0464d157905c6b4fae2136f':
  Add camera affordance to navigation bar on phones
 2013-09-20 11:21:11 -07:00
Svetoslav
6e1e8b17c5 am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 
* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
  Move PdfDocument to android.graphics.pdf
 2013-09-20 11:21:05 -07:00
Craig Mautner
d052ee34a5 am f15024c8: am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev 
* commit 'f15024c8c8b3d21919347070909049c61c14ae06':
  Only show launcher for the bottom activity in a task
 2013-09-20 11:21:00 -07:00
David Braun
119ad51710 am e28962fe: am 3372cb26: Merge "Add config setting for default sms app." into klp-dev 
* commit 'e28962fe8e109d240b2f76988f93234e76a8eab9':
  Add config setting for default sms app.
 2013-09-20 11:20:53 -07:00
Glenn Kasten
1f6ec93f12 am 0fbb7484: am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev 
* commit '0fbb74847aec65b057cad019d86617d9703c7c7a':
  Workaround for slow AudioRecord destructor
 2013-09-20 11:20:47 -07:00
Joe Fernandez
a48dfca9e4 am cda15002: am a17309fd: am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit 'cda1500201fb549caa6f324f61c2ad21bcd81536':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-20 11:20:41 -07:00
Joe Fernandez
3f3d49a032 am 29ccf51f: am 27f525c4: am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '29ccf51fc7c48559e20a1650837c9210f3cfe788':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-20 11:20:37 -07:00
Ed Heyl
083ebcf49a am 3ece8270: am 812c4d73: Merge "fix typo" into klp-dev 
* commit '3ece8270173df27518c16a5904ae5fe3c6b51913':
  fix typo
 2013-09-20 11:20:33 -07:00
Leon Scroggins III
29baa03ba5 am 2360ada9: am 57989c0e: Merge "Skip writing zeroes to java allocated memory." into klp-dev 
* commit '2360ada939b0abd4a6cca794288ff06701219f19':
  Skip writing zeroes to java allocated memory.
 2013-09-20 11:20:22 -07:00
Victoria Lease
9e233b54b6 am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp-dev 
* commit 'ab99b39d7d152de35ea02a364190ff325da4015b':
  fix emoji clipping in hw draw path
 2013-09-20 11:20:06 -07:00
Amith Yamasani
fa80ffa4fd am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev 
* commit '638918a2681cff345b9e3bd5ff7b170a874125dc':
  Fix a regression in pausing activity immediately on sleep
 2013-09-20 11:20:03 -07:00
Eino-Ville Talvala
84fa15ce63 am f3c61c66: am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev 
* commit 'f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7':
  TextureView/GLES20Canvas: Support synchronous GLConsumers
 2013-09-20 11:19:45 -07:00
Glenn Kasten
f69cd6787d Revert "Workaround for slow AudioRecord destructor" 
This reverts commit 8d87d7ba113ad90685f1d2669e65251a9b422a5a.

Change-Id: I78cbe73959d29fc0ff3153268503ae685cd0995c
 2013-09-20 18:10:28 +00:00
Adam Lesinski
79a8ffe54f Ensures that CompatibilityInfo is always set in Resources 
- Adds null checks when setting mCompatibilityInfo and uses default no-op
  CompatibilityInfo object instead of null
- Removes null checks when calling methods on mCompatibilityInfo since it is never
  null

bug:10204942

Change-Id: I36e88f5cdceb46b8b19fb902270ef74023a81546
 2013-09-20 11:04:40 -07:00
Robert Greenwalt
032de6c629 am c237c204: Merge "Supsend/resume batched scans around dhcp." into klp-dev 
* commit 'c237c20441df671a4c596138976f15e40aa95cf3':
  Supsend/resume batched scans around dhcp.
 2013-09-20 11:00:58 -07:00
Robert Greenwalt
c237c20441 Merge "Supsend/resume batched scans around dhcp." into klp-dev 2013-09-20 17:55:44 +00:00
Dianne Hackborn
a2067473e8 Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest 
Change-Id: Id6432fc1b62db41c6c291ec08450c2fc37ced899
 2013-09-20 10:54:16 -07:00
Robert Greenwalt
eccc0905bd am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit '540784f903c8a9e808ef88d14fe5e1227bda4561':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 10:50:39 -07:00
Robert Greenwalt
540784f903 Merge "Cleanup the shutdown of BatchedScans." into klp-dev 2013-09-20 17:43:30 +00:00
Svetoslav
b206f1271d Null not handled when parsing media size resource id attribute. 
bug:10835715

Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
 2013-09-20 10:43:29 -07:00
Dianne Hackborn
9bef5b67dc resolved conflicts for merge of 20021b30 to master 
Change-Id: Ie758de25a277ed0a25bf08e4cd2c57c9519bd52d
 2013-09-20 10:40:34 -07:00
Robert Greenwalt
81fec6be04 Supsend/resume batched scans around dhcp. 
Scanning while dhcp is running breaks dhcp, so stop the batched scans
when we need dhcp and start it up again after.

bug:10691401
Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
 2013-09-20 10:13:46 -07:00
Scott Main
81c494b680 am 562ce888: am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '562ce888af21fc18d1610545ff6373ee2ecbbb13':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:12:53 -07:00
Vinit Deshapnde
0fd3b1be14 Fix incorrect exception being thrown from WifiConfiguration 
Bug: 10817189

Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
 2013-09-20 10:12:30 -07:00
Scott Main
562ce888af am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '8f6ed205a2523a8170cdd3e824170fd77c4fd65a':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:10:22 -07:00
Scott Main
8f6ed205a2 am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '208e6079b4ccd161de198553319d285711564ea2':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:07:46 -07:00
Scott Main
208e6079b4 am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '0333302ad7162f66404c08e1c6c5b6b767aa78b3':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:04:26 -07:00
Igor Murashkin
52c77ea4d1 am a7dd66a4: am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev 
* commit 'a7dd66a4709353cd27b4482be73d2b3804cbeaa6':
  Camera2Tests: create new directory for manual camera2 test apps
 2013-09-20 09:58:48 -07:00
Yuhao Zheng
5380b780bb am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev 
* commit '2e9a426529c54774b23609bee8d50118118ab895':
  Remove STOPSHIP in WifiWatchdogStateMachine
 2013-09-20 09:58:45 -07:00
Craig Mautner
de4232f721 am 9ea8bf15: am 7908f190: Merge "Debug for b/10689184." into klp-dev 
* commit '9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd':
  Debug for b/10689184.
 2013-09-20 09:58:41 -07:00
Scott Main
0333302ad7 Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 2013-09-20 16:58:39 +00:00