100562 Commits

Author SHA1 Message Date
Kristian Monsen
88e4b3ff90 Final merge fix
Fixing a crash on reboot. After this it builds and cts tests passes
as before. I don't have a device locally so can't see if it
actually works.

Change-Id: I56cd09d5f83f8096ba0fe8aa8e93ca4286f42e3a
2013-02-14 23:07:35 -08:00
Kristian Monsen
e32e2b343d Fixup from merge, and compile fix due to different skia version
Change-Id: I644c5148904893a2854207f4d566395d973d4aff
2013-02-14 21:37:01 -08:00
Jeff Sharkey
a55e29a475 am 7b3745fe: Merge "Update scrubClass() to match CoreTestRunner."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7b3745fe9aa0d78add1045258d2855d5980a650b':
  Update scrubClass() to match CoreTestRunner.
2013-02-14 19:59:06 -08:00
Victoria Lease
c85637f0e6 am c69bce2e: Merge "fix argument mismatches in Paint JNI"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'c69bce2e41c70da35e1b6a2ab5ec44469ab14c80':
  fix argument mismatches in Paint JNI
2013-02-14 19:59:03 -08:00
Adam Powell
eaa74a42f9 am 9d40d872: Merge "Add support for shadows in TextAppearance styles"
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '9d40d8720d422fc39068e7b0b0ae6f13621c3de1':
  Add support for shadows in TextAppearance styles
2013-02-14 19:58:59 -08:00
Jeff Sharkey
0438d0ded5 am 07aef1c7: Merge "Remove throttle settings, no longer needed."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '07aef1c78a92e70552f269b37615c19aea042410':
  Remove throttle settings, no longer needed.
2013-02-14 19:58:56 -08:00
Jeff Sharkey
452d589c65 am 7ee9f636: Merge "Expose longer statfs values, add derived values."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7ee9f636284584affa54b9735ccf157375b1c065':
  Expose longer statfs values, add derived values.
2013-02-14 19:58:53 -08:00
Mathias Agopian
163117bdad am bfcae359: Surface doens\'t have an identity anymore
# Via Mathias Agopian
* commit 'bfcae3595900b79401d635022bd6d30a5b5a6576':
  Surface doens't have an identity anymore
2013-02-14 19:58:50 -08:00
Mathias Agopian
0233b6ee33 am 30d7ab9a: fix docs build
# Via Mathias Agopian
* commit '30d7ab9a10fcde397bae7bed5f16d1094fded8b2':
  fix docs build
2013-02-14 19:58:47 -08:00
Craig Mautner
924bf18c75 am 22ee9aad: Merge "Reset and reuse Iterators and don\'t new() one."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '22ee9aad834b055df1bd5d5544e37a63edc963fe':
  Reset and reuse Iterators and don't new() one.
2013-02-14 19:58:44 -08:00
Kenny Root
647771659c am 0786207b: am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (2) and others
* commit '0786207be59d34a8ba8a7a1e93602002fac97587':
  KeyStore: stop using state()
2013-02-14 19:58:33 -08:00
Kristian Monsen
1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
2013-02-14 19:48:27 -08:00
Christopher Tate
416c39e8d4 Full backup now saves getExternalFilesDir() content with the app data
... instead of only saving it with the enormous "shared storage" generic
data blob.  In parallel, we no longer store managed app-specific files
on external storage as part of the generic shared-storage blob.

At restore time we just go ahead and apply such files, though,
because they're a priori going to be part of an archive generated by
an older version of the platform, so that's how the data is expected
to be handled in those circumstances.

Bug 6718844

Change-Id: I4410514d368b11d74b3afe6b92d363d4115a3415
2013-02-14 18:46:53 -08:00
Michael Wright
00e592272e Merge "Fix default behavior for gamepad buttons" 2013-02-15 01:47:38 +00:00
Chris Craik
101ae3bb39 Merge "Move DisplayList to its own cpp file" 2013-02-15 00:50:52 +00:00
Jeff Sharkey
7b3745fe9a Merge "Update scrubClass() to match CoreTestRunner." 2013-02-15 00:30:52 +00:00
Victoria Lease
c69bce2e41 Merge "fix argument mismatches in Paint JNI" 2013-02-15 00:15:29 +00:00
Laurent Tu
4f115e08cb Tentative fix for aidl import issue
Fix issue when aidl generation doesn't use the right type when
it is a suffix of a pre-declared type.

eg. android.location.Location and foo.android.location.Location. The
aidl generation will never use foo.android.location.Location.

The tentative fix reverses the order in which Namespace.Search iterates
through the known types.

A better fix would be to annotate the types that are declared in the
aidl import statements to be prioritary in Namespace.Search. Lmk if I
you agree with this approach and think that this is worth the work.
Thanks!

Change-Id: I97dd1a1d417075accf1d61f9aba5aba3dea175c6
2013-02-14 16:12:54 -08:00
Adam Powell
9d40d8720d Merge "Add support for shadows in TextAppearance styles" 2013-02-15 00:06:56 +00:00
Jeff Sharkey
dd86cb7caf Update scrubClass() to match CoreTestRunner.
AndroidTestCase.scrubClass() is quite aggressive, and would end up
clearing out final fields like these:

private static final byte[] TEST_DATA = new byte[1];

This change updates the logic to match InstrumentationCoreTestRunner
in the cleanup() method.

Change-Id: Iba455ea35b2628473ce0ccc1431ab47c1caad45c
2013-02-14 16:04:37 -08:00
Jeff Sharkey
07aef1c78a Merge "Remove throttle settings, no longer needed." 2013-02-15 00:02:17 +00:00
Victoria Lease
b61fb10fe4 fix argument mismatches in Paint JNI
Paint.getTextRunCursor() no longer has a "flags" argument on the Java
side. The native side, however, still had the argument, and was being
called with misaligned arguments, causing all manner of madcap fun.

Also, the version of Paint.getTextRunCursor() that took String as an
argument needed to lose the "flags" argument, as well, to prevent an
infinite loop in the CharSequence version of the function, which was
supposed to be calling the String version but was actually calling
itself.

Bug: 8201224
Change-Id: Iad0dabaf81185f29a082566cc64590f2ba9bc31c
2013-02-14 15:58:46 -08:00
Jeff Sharkey
7ee9f63628 Merge "Expose longer statfs values, add derived values." 2013-02-14 23:46:01 +00:00
Chris Craik
0776a60693 Move DisplayList to its own cpp file
Change-Id: Ic9c1bbf4673ad5c756f3908b2ab7e699edd6a119
2013-02-14 15:40:03 -08:00
Mathias Agopian
bfcae35959 Surface doens't have an identity anymore
Change-Id: Ic62c0f6ba9aae9b67335a2029a5de1caa3fc5b94
2013-02-14 15:39:04 -08:00
Mathias Agopian
30d7ab9a10 fix docs build
Change-Id: I9819693cfa9ad5b8b15b62eab60ddd35a53c5531
2013-02-14 15:39:04 -08:00
Craig Mautner
22ee9aad83 Merge "Reset and reuse Iterators and don't new() one." 2013-02-14 22:22:35 +00:00
Adam Powell
ac91df87fc Add support for shadows in TextAppearance styles
Allow developers to specify shadow properties for text in a
TextAppearance, not just in direct TextView attributes.

Change-Id: I873fbaf2c26683895e1eea2d02b5d9b17ca333d0
2013-02-14 13:48:47 -08:00
Kenny Root
0786207be5 am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()
2013-02-14 12:50:34 -08:00
Craig Mautner
343ad71d7c Reset and reuse Iterators and don't new() one.
Save time and memory by resuing permanent mTmpXxxIterator for
AllWindowsIterator and AppTokenIterator.

Change-Id: I2e5143364651d9471e9e70eee514d3f45d595468
2013-02-14 12:48:53 -08:00
Kenny Root
dc7b3e3b6e am 9657ba0e: Merge "KeyStore: stop using state()"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '9657ba0edc8bab5a36c26bcd94366149aed63331':
  KeyStore: stop using state()
2013-02-14 12:48:18 -08:00
Mathias Agopian
58a1ca6642 Merge "split Surface in two classes: SurfaceControl and Surface" 2013-02-14 20:25:08 +00:00
Mathias Agopian
ab31d35749 am a41b23d5: Merge "get rid of Surface.getIdentity()"
# Via Android (Google) Code Review (1) and Mathias Agopian (1)
* commit 'a41b23d55da1bd8e68eb784f28e2c3fe9ded080e':
  get rid of Surface.getIdentity()
2013-02-14 12:25:07 -08:00
Mathias Agopian
a41b23d55d Merge "get rid of Surface.getIdentity()" 2013-02-14 20:22:33 +00:00
Mathias Agopian
3866f0d581 split Surface in two classes: SurfaceControl and Surface
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.

Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
2013-02-14 12:19:11 -08:00
Kenny Root
9657ba0edc Merge "KeyStore: stop using state()" 2013-02-14 20:18:09 +00:00
Dirk Dougherty
c6583c3ed6 am dfb306b2: am f16de3f3: am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (5) and Dirk Dougherty (1)
* commit 'dfb306b2bc0adbec29e7ccd1a8ecb92502497573':
  Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:13:31 -08:00
Dirk Dougherty
dfb306b2bc am f16de3f3: am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'f16de3f3f622a04d48cd595c76165ac60a3efcfa':
  Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:11:30 -08:00
Dirk Dougherty
f16de3f3f6 am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476':
  Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:09:16 -08:00
Dirk Dougherty
0f4a378dc7 am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'da9ac596a171ff46a241f52a89015a0090e9ba18':
  Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:07:39 -08:00
Kenny Root
b9594ce9eb KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
2013-02-14 12:06:51 -08:00
Dirk Dougherty
da9ac596a1 am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '9a93e079791b7a94ca62a08963ff18951429700e':
  Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:05:49 -08:00
Dirk Dougherty
9a93e07979 am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Dirk Dougherty
* commit 'f857c51d77d2199cfb3351e0e1c93a55e8564dc4':
  Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:03:35 -08:00
Dirk Dougherty
f857c51d77 Doc change: add notice for iab v3 subscriptions launch.
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
2013-02-14 11:47:36 -08:00
Craig Mautner
0db3416e37 am 3beb8757: Merge "Remove AppWindowToken lists."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '3beb8757ac9ba0829bf96e067ae32315f1d4bb3f':
  Remove AppWindowToken lists.
2013-02-14 11:43:49 -08:00
Craig Mautner
3beb8757ac Merge "Remove AppWindowToken lists." 2013-02-14 19:40:23 +00:00
Russell Brenner
dfd2cfc085 am b3d71a10: Merge "Adjust captive portal test for setup wizard"
# Via Android (Google) Code Review (1) and Russell Brenner (1)
* commit 'b3d71a106e9f142ffe3ee901c63dac91640a74b9':
  Adjust captive portal test for setup wizard
2013-02-14 11:36:46 -08:00
Russell Brenner
b3d71a106e Merge "Adjust captive portal test for setup wizard" 2013-02-14 19:31:46 +00:00
Russell Brenner
108da0cfa4 Adjust captive portal test for setup wizard
During setup wizard, perform captive portal test without the typical
delays.

Change-Id: If596948e732966817aae6201440e87e19be0c2f8
2013-02-14 11:02:10 -08:00
Craig Mautner
496bdbba30 Remove AppWindowToken lists.
No longer necessary.

Change-Id: I0d2b96f69152fb93b6ba56f02ce9693ff1370cbc
2013-02-14 10:56:11 -08:00