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

46231 Commits

Author SHA1 Message Date
Kenny Root
da776c872e Use X509ExtendedTrustManager and not Conscrypt 
This allows the new X509ExtendedTrustManager to be used instead of
Conscrypt directly.

Bug: 13103812
Change-Id: I736f475342395f26657f2371828a6d3a0065a50a
 2014-03-24 17:05:22 -07:00
Baligh Uddin
077587fb50 Import translations. DO NOT MERGE 
Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
Auto-generated-cl: translation import
 2014-03-24 09:46:08 -07:00
Narayan Kamath
02eb6bfd66 Fix scaleNinePatch. 
Use yDivs for yDivs, and not xDivs.

bug: 13394494

(cherry picked from commit 42a51ae8812bccde7ff370cc2688f7955e489ad4)

Change-Id: Ia0a7d701a170945216ab247a483e7f972b6fe17e
 2014-03-24 12:35:01 +00:00
Gabriel Peal
16578caea8 am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-22 23:41:43 +00:00
Gabriel Peal
e05077d78c am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
* commit '83da75d938d519bbcffb9c3b52802fd2daad4aee':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-22 23:35:00 +00:00
Gabriel Peal
83da75d938 Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
The first set of these APIs is for telephony:

Added some APIs to ITelephony and created a first party framework for them

toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)

Bug: 13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
 2014-03-22 13:33:43 -07:00
Igor Murashkin
965bed1c2c DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values 
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
 2014-03-22 01:36:54 +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
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
de4e7b4947 Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +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
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
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
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
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
d16505da86 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-20 18:32:35 +00:00
Wei Wang
b0d63d5359 am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '13bd85772f6279d14303ec3a18615613c3722844':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 16:38:04 +00:00
Wei Wang
9b12bd90a5 am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit '15a18d07acc57d465e9d67bb28010912bb9ad15f':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 16:37:53 +00:00
Adam Powell
f503a2d47f Update contextual asset bar assets to avoid 9-patch artifacts 
Asset drop from UX

Bug 11879853

Change-Id: I8190340900a16ae41135ec1231e36e959603e165
 2014-03-20 09:32:11 -07:00
Victoria Lease
3486659584 am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae':
  malloc some advances
 2014-03-20 15:41:49 +00:00
Narayan Kamath
a2275b9869 am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1':
  Don't register methods when there's nothing to register.
 2014-03-20 10:18:46 +00:00
Wei Wang
13bd85772f am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit 'c0384b6b18617cc395814c5b20077955a185e392':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 03:41:47 +00:00
Wei Wang
15a18d07ac am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit 'da084104eb768f4472b7988b77a4f2b7e3f170d8':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 03:32:17 +00:00
Wei Wang
c0384b6b18 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 
Cherrypick from master to fix b/13289050

Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
 2014-03-19 20:31:36 -07:00
Wei Wang
4b4eebb9a5 DO NOT MERGE: Add status callback for start/stop advertising. 
Cherrypick from master to fix b/13289050

Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java
 2014-03-20 00:33:41 +00:00
Victoria Lease
cfd46dc484 am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '610d401cb580ee233c008acf8fc076047a0ffdb4':
  malloc some advances
 2014-03-19 22:32:12 +00:00
Victoria Lease
610d401cb5 am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
  malloc some advances
 2014-03-19 22:27:06 +00:00
Victoria Lease
e9c7fd2f2e am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '55371beb024ae402831898f8788e4293f52dd832':
  malloc some advances
 2014-03-19 15:21:09 -07:00
Victoria Lease
55371beb02 am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
  malloc some advances
 2014-03-19 15:14:07 -07:00
Victoria Lease
754bf6abc0 am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
  malloc some advances
 2014-03-19 15:08:32 -07:00
Vinit Deshapnde
45b97c2c99 DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns 
This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.

BUG: 11062898

Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
 2014-03-19 15:04:49 -07:00
Victoria Lease
c8868db2a0 am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances
 2014-03-19 15:03:28 -07:00
Victoria Lease
737d3e5da3 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
  malloc some advances
 2014-03-19 14:57:36 -07:00
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00
Victoria Lease
6eb2810318 am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances
 2014-03-19 14:32:15 -07:00
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Jeff Brown
1c394559d9 am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '80af53162477385f20956a55305d0c048ef5c1df':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:11:12 +00:00
Jeff Brown
80af531624 am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:05:40 +00:00
Jeff Brown
f260ed0926 Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 2014-03-19 20:01:42 +00:00
Baligh Uddin
7cf3e334be Import translations. DO NOT MERGE 
Change-Id: I2a993d03ba28b42348c201919c4d1ab6bae23445
Auto-generated-cl: translation import
 2014-03-19 09:48:18 -07:00