119675 Commits

Author SHA1 Message Date
Alex Klyubin
8e0787f308 am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
  Adjust to the change in the private SSLParameterImpl API.
2014-03-21 18:46:49 +00:00
Alex Klyubin
d8c32164e1 am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '88517170cbb09b45324d5b457a0e5e840cc7d09b':
  Adjust to the change in the private SSLParameterImpl API.
2014-03-21 11:41:38 -07:00
Alex Klyubin
88517170cb Merge "Adjust to the change in the private SSLParameterImpl API." 2014-03-21 18:36:08 +00:00
John Reck
91f0a455bb Eliminate mHasAlpha
Bug: 13580771

 The cached value mHasAlpha on Bitmap could get out of sync with the
 real value stored in the SkBitmap. Fix this by just eliminating the
 cached value. This adds an extra JNI call in copy(), createBitmap(),
 and setPremultiplied(), none of which are going to be significantly
 impacted by the extra JNI call.

Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
2014-03-21 18:16:18 +00:00
Alex Klyubin
a2507e8764 Adjust to the change in the private SSLParameterImpl API.
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.

Bug: 13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
2014-03-21 11:13:50 -07:00
Jeff Sharkey
e0a0d0a911 am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit 'c620ec3614c8737b87d60efa9db96c288bcad794':
  Lock down MANAGE_DOCUMENTS permission.
2014-03-21 17:57:01 +00:00
Jeff Sharkey
c620ec3614 am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '3f5232220f2db839f690489ed272113f660daa40':
  Lock down MANAGE_DOCUMENTS permission.
2014-03-21 17:50:39 +00:00
Jeff Sharkey
3f5232220f Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 2014-03-21 17:47:00 +00:00
Ricardo Cervera
a7925384c3 docs: Added new sensor types. Bug: 10674725
Change-Id: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
2014-03-21 09:59:22 -07:00
Michael Jurka
3368a63c64 Change wallpaper sizing
Bug: 11997581

- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary

Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
2014-03-21 10:29:27 +00:00
Mike Lockwood
4475a36804 am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '71060db65e0e1c903b429c932cd6e27beec10a3e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
2014-03-21 01:14:18 +00:00
Mike Lockwood
0796ba8d76 am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '935d417b5615a62bc521a8eb58c35de1b4fdf841':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
2014-03-21 01:14:15 +00:00
Mike Lockwood
71060db65e am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit 'dffdf1079da76f532cd6e72bf537c1a69b099c7e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
2014-03-21 01:09:33 +00:00
Mike Lockwood
935d417b56 am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit 'afc3a5d386459667f87d764038dd30e3490c64c2':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
2014-03-21 01:09:31 +00:00
Mike Lockwood
dffdf1079d Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 2014-03-21 01:06:16 +00:00
Mike Lockwood
afc3a5d386 Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 2014-03-21 01:05:57 +00:00
Wei Wang
002516fb0b am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit 'bf0568468da9e02c177abaf9116f9995d53b59aa':
  Fix stopBatchedScan not working for wifi
2014-03-21 00:45:59 +00:00
Wei Wang
bf0568468d am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi
2014-03-21 00:41:23 +00:00
Wei Wang
058061da46 Merge "Fix stopBatchedScan not working for wifi" into klp-dev 2014-03-21 00:37:34 +00:00
Adam Powell
b035cfd3f4 am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit 'a6454ccbfb5b1f39047f8bac74ec11093469cce2':
  Update contextual asset bar assets to avoid 9-patch artifacts
2014-03-21 00:27:25 +00:00
Adam Powell
a6454ccbfb am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '49325305905198b9d077ccc784be96e5684e3623':
  Update contextual asset bar assets to avoid 9-patch artifacts
2014-03-21 00:22:38 +00:00
Adam Powell
4932530590 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 2014-03-21 00:19:12 +00:00
Wei Wang
d181673e28 Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
2014-03-20 17:05:42 -07:00
Marco Nelissen
bb4eb4a329 am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit '7d09713c5198579c0855089a0a77328d4ec1dc36':
  Verify certificates
2014-03-20 20:44:58 +00:00
Marco Nelissen
7d09713c51 am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit '7cd52895ec3e014c1097852725ba68646c1d6665':
  Verify certificates
2014-03-20 20:41:54 +00:00
Marco Nelissen
7cd52895ec am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates
2014-03-20 20:36:34 +00:00
Marco Nelissen
5035faba9a am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
  Verify certificates
2014-03-20 13:22:34 -07:00
Marco Nelissen
cecc62086a am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit '759445c5bdb2eb54af9e974f604226596976e078':
  Verify certificates
2014-03-20 13:16:32 -07:00
Marco Nelissen
759445c5bd resolved conflicts for merge of c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
2014-03-20 12:51:55 -07:00
Derek Sollenberger
73041c91e5 Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev-plus-aosp 2014-03-20 19:45:30 +00:00
Leon Scroggins III
2488727a59 Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)

Bug: 13246311

This cherry-picks 7 CLs:

-----------------------------------------------------------------------

Remove calls to deprecated SkBitmap::setIsOpaque()

setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

-----------------------------------------------------------------------

Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
  the length (read(NULL, 0)) is no longer implemented, since it is
  no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
  so some implementation is necessary.

cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

-----------------------------------------------------------------------

Deprecate Android-specific SkPaint functions.

The following functions were problematic:
 const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
 const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
 const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

-----------------------------------------------------------------------

pass SkGlyphCache into updateGlyphCache()

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

-----------------------------------------------------------------------

Updates to the Skia API needed to merge the WebView m33 version of Skia.

cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

bug: 12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

-----------------------------------------------------------------------

Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

-----------------------------------------------------------------------

Change-Id: Icaf597783da3ffb079ea18badb78fa31403bf8b8
2014-03-20 15:38:46 -04:00
Mike Lockwood
d8be49089f UsbDeviceManager: A better fix for race condition when starting USB accessory mode
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received.  However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode.  To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received.  Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.

Bug: 13393825

Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
2014-03-20 12:36:51 -07:00
Mike Lockwood
205a3ea0e2 Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit fbd5521fb5e94fad066e21b9f91f4782afe71660.

This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start".  So we revert this change and will replace it with a better fix.

Bug: 13535051
Bug: 13393825

Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
2014-03-20 12:36:34 -07:00
Vinit Deshapnde
ec253bb376 am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
2014-03-20 19:36:22 +00:00
Vinit Deshapnde
f92b00722d am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
2014-03-20 19:31:42 +00:00
Vinit Deshapnde
52bc363cf3 Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 2014-03-20 19:26:44 +00:00
Baligh Uddin
70048744af am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '826f3647a4a44ffcf154c63fe204a7787b96a657':
  Import translations. DO NOT MERGE
2014-03-20 19:04:11 +00:00
Baligh Uddin
826f3647a4 am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd16505da8676b54dd354da278b1888f28257028b':
  Import translations. DO NOT MERGE
2014-03-20 18:37:14 +00:00
Baligh Uddin
d16505da86 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-20 18:32:35 +00:00
Marco Nelissen
c53ad4cd80 am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
  Verify certificates
2014-03-20 11:11:16 -07:00
Marco Nelissen
072e1da26e am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates
2014-03-20 11:06:41 -07:00
Marco Nelissen
b17cf20737 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates
2014-03-20 10:54:38 -07:00
Marco Nelissen
9ee72b6543 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates
2014-03-20 10:51:35 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
2014-03-20 10:47:34 -07:00
Colin Cross
4a1bc7dfc1 am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
2014-03-20 17:47:10 +00:00
Colin Cross
e4360c8e14 am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit '4308a5230e2887c1ee12e7bdc60e0b93212637ab':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
2014-03-20 10:33:20 -07:00
Colin Cross
4308a5230e Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 2014-03-20 17:28:12 +00:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
2014-03-20 10:27:58 -07:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
2014-03-20 10:04:23 -07:00
Marco Nelissen
a3337bc7c3 Merge "Verify certificates" into jb-dev 2014-03-20 16:58:37 +00:00