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

120058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quddusc
ff2599f9b2 am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '0802b4fb391eecf37626d3d57f5e07eeb32a3185':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-22 00:01:16 +00:00
quddusc
e9863dbe06 Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 2014-03-21 23:55:43 +00:00
quddusc
0802b4fb39 Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 2014-03-21 23:55:34 +00:00
quddusc
e0f1fc8598 docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page. 
Change-Id: Idc5dc716aa92c752b8dcd1967958d9d46521dfa6
 2014-03-21 16:38:25 -07:00
Selim Cinek
ace827ccf1 am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '50ac19e9b8d3435eab44cacbb62c5081f44df910':
  Disable Set Wallpaper button while loading image
 2014-03-21 23:09:43 +00:00
Chad Brubaker
ecdbb6a5a3 am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
  Fix support for simultaneous VPN tuns
 2014-03-21 23:09:24 +00:00
Chad Brubaker
aa5a99b3b8 am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 23:09:21 +00:00
Selim Cinek
50ac19e9b8 am ba126c09: Disable Set Wallpaper button while loading image 
* commit 'ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
  Disable Set Wallpaper button while loading image
 2014-03-21 22:41:07 +00:00
Selim Cinek
ba126c09a5 Disable Set Wallpaper button while loading image 
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit 0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
 2014-03-21 22:15:10 +00:00
Chad Brubaker
eb3c0d9ac3 am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
  Fix support for simultaneous VPN tuns
 2014-03-21 20:56:41 +00:00
Chad Brubaker
1fce89d946 am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'de4e7b4947998638e0345ab9a181bf35a8827bef':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 20:56:37 +00:00
Chad Brubaker
1aad3ad4ec Merge "Fix support for simultaneous VPN tuns" into klp-dev 2014-03-21 20:52:14 +00:00
Chad Brubaker
de4e7b4947 Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +00:00
Ricardo Cervera
9cd17ea6af am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '588300cb5211f7217b81683f8a76bdf95c7bfa8d':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:11:44 +00:00
Ricardo Cervera
588300cb52 am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '2e92965820d61b704e0eb307da70825c46d899d3':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:06:06 +00:00
Ricardo Cervera
2e92965820 Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 2014-03-21 20:01:31 +00:00
John Reck
48a851f66b am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit 'fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
  Eliminate mHasAlpha
 2014-03-21 19:47:03 +00:00
John Reck
fc603ca6b5 am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit 'abf701e6751aed487d4ed0986e0fae8810c3658f':
  Eliminate mHasAlpha
 2014-03-21 19:41:00 +00:00
John Reck
abf701e675 Merge "Eliminate mHasAlpha" into klp-dev 2014-03-21 19:37:28 +00:00
Unsuk Jung
b35962f77c am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
 2014-03-21 19:10:57 +00:00
Unsuk Jung
8114c3d02d am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
  Change wallpaper sizing
 2014-03-21 19:05:40 +00:00
Unsuk Jung
1a70f39160 Merge "Change wallpaper sizing" into klp-dev 2014-03-21 19:01:08 +00:00
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
leo_hsu
82a91631d5 [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off. 
Symptom: Unable to start any activity.
Root Cause: ActivityStack.mPausingActivity() points to a destroyed activity of a died process, so that ActivityStackSupervisor.allPausedActivitiesComplete() always returns false.
Solution: Set mPausingActivity to null in ActivityStack.cleanUpActivityLocked().
Reproduce steps:
    a. Turn screen off.
    b. A background service starts an activity X (in process X).
    c. A background service starts a no-history activity Y (in process Y), but the main thread of Y was blocked.
    d. A background service starts Y 3~4 times --> this causes am_failed_to_pause on X.
    e. Main thread of Y is freed finally --> this causes Y crash for android.view.WindowManager$BadTokenException.
    f. Turn screen on, X is shown on screen, but neither back key nor home key can work because mPausingActivity is Y.

Change-Id: I320b3db407e2d4cc745c8ca22a6e548742234242
 2014-03-21 12:27:16 +08: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