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

46430 Commits

Author SHA1 Message Date
Wei Wang
0d68a52ad3 am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev 
* commit '9d3e099699c3b6cd0f4bed344607d6a5acd75c1c':
  Add comment of using same callback for start/stop advertising.
 2014-03-28 04:07:55 +00:00
Wei Wang
f3f52b1b4c Add comment of using same callback for start/stop advertising. 
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
 2014-03-27 19:34:46 -07:00
Jeff Sharkey
0a42e5fa29 am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '2d8f330fe709d405915ebb1fa2673e575e19112e':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:56:08 +00:00
Jeff Sharkey
2d8f330fe7 am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit 'a686d16d5924d2afe06586110e7dca33ecad535c':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:49:21 +00:00
Jeff Sharkey
a686d16d59 am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '0bc7cea6aa2523f9f519f63038c541cb1b1942a8':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:43:53 +00:00
Jeff Sharkey
0bc7cea6aa Enlarge space allowed for internal downloads. 
Bug: 13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
 2014-03-27 18:16:32 -07:00
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp 
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
 2014-03-27 12:50:58 +00:00
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable 
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-03-27 12:30:42 +00:00
Kenny Root
1dc1d6b22d am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '5b93685af37d840e7ef6d415bcfe8a8a4c004032':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-27 00:10:41 +00:00
Baligh Uddin
b79bceeb6f Import translations. DO NOT MERGE 
Change-Id: I4da32094b7c44f5042c276dc7dd2aef2132ffca9
Auto-generated-cl: translation import
 2014-03-26 11:08:06 -07:00
Baligh Uddin
9ac253ffed Import translations. DO NOT MERGE 
Change-Id: I9e363ec3f4253e6496f1c6cc6019bb807388e7f4
Auto-generated-cl: translation import
 2014-03-26 11:06:02 -07:00
Kenny Root
587a9455de CertificateChainValidator: initialize TrustManagerFactory 
Need to call TrustManagerFactory#init before use. I suspect this class
isn't used anywhere since this hasn't caused a problem yet.

Change-Id: I17425d0bba4795d71960062361a755830abba7de
 2014-03-26 08:40:45 -07:00
Will Haldean Brown
f3f1c7a334 am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit '63d161e4ae57b61b33d77f4ea3c91279a6acb807':
  Remove all but two micro themes, light and dark.
 2014-03-25 21:47:06 +00:00
Will Haldean Brown
63d161e4ae Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 2014-03-25 21:39:17 +00:00
Will Haldean Brown
61e0965678 Remove all but two micro themes, light and dark. 
Bug: 13434321
Change-Id: I201cb22e3fd7aa629f4d25004be6b4b9e05907a3
 2014-03-25 13:38:33 -07:00
Eino-Ville Talvala
63d61640d4 am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '55a1e78fbd38955a5f5d0f09a517b392cc8199cb':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:15:52 +00:00
Eino-Ville Talvala
55a1e78fbd am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:11:12 +00:00
Kenny Root
dd3e639909 am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit 'c1d863e7a4b55f8e583067eebaffc6686723d7ab':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 19:09:27 +00:00
Eino-Ville Talvala
1555cec2e5 am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit 'ecad0541a6e90b98ad96456c4e6992121ee8a789':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 19:01:45 +00:00
Eino-Ville Talvala
ecad0541a6 Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 2014-03-25 18:57:08 +00:00
Baligh Uddin
f318306232 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 18:56:38 +00:00
Kenny Root
77ceb5e8f1 Merge "Use X509ExtendedTrustManager and not Conscrypt" 2014-03-25 17:06:55 +00:00
Narayan Kamath
163b865564 am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit 'ea96d791c7eca3eb5d003b8559b89a573f81dac9':
  Fix scaleNinePatch.
 2014-03-25 14:32:10 +00:00
Gabriel Peal
4668f1ed0d am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
* commit '8ee4491dc80943429cd79d0c7b87c28056067a58':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-25 03:54:11 +00:00
Gabriel Peal
8ee4491dc8 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-25 03:46:17 +00:00
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
Chong Zhang
b68d38e81f DO NOT MERGE change Surface constructor arg to 64bit 
Bug: 12799017
Bug: 12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)
 2014-03-24 21:01:37 +00:00
John Spurlock
e2cae0a657 am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev 
* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
  Unhide Notification kind, rename to category.
 2014-03-24 17:44:53 +00:00
John Spurlock
2b45d84e24 Merge "Unhide Notification kind, rename to category." into klp-modular-dev 2014-03-24 17:38:44 +00:00
Baligh Uddin
d3ff73381e Import translations. DO NOT MERGE 
Change-Id: I2c8a0e45a30fdb43c65abce0a9db7eec1591363a
Auto-generated-cl: translation import
 2014-03-24 09:48:18 -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
Jose Lima
d13d701681 am eb2c85df: Merge "Added isGame application tag to the manifest" into klp-modular-dev 
* commit 'eb2c85df4b2d8ea5dd3cd08cb0367d5ff666afe6':
  Added isGame application tag to the manifest
 2014-03-24 15:53:24 +00:00
Jose Lima
eb2c85df4b Merge "Added isGame application tag to the manifest" into klp-modular-dev 2014-03-24 15:49:18 +00:00
Mark Renouf
3796594cd7 am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 
* commit 'a63cd9f424d70a3f8ca059aa8f76b28be1f9fa07':
  Run finalizers before counting for StrictMode.
 2014-03-24 15:27:45 +00:00
Mark Renouf
a63cd9f424 Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 2014-03-24 15:22:55 +00:00
John Spurlock
cf44a124ab Unhide Notification kind, rename to category. 
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
 2014-03-24 11:02:36 -04: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
Jinsuk Kim
3c34e5dbbb am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
  Add HdmiCecManager
 2014-03-24 12:26:51 +00:00
Jinsuk Kim
c01e1aeb0d Merge "Add HdmiCecManager" into klp-modular-dev 2014-03-23 23:24:44 +00:00
Jinsuk Kim
fbcd503645 Add HdmiCecManager 
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26
 2014-03-24 08:19:39 +09: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
Jose Lima
12d0b4cd96 Added isGame application tag to the manifest 
Added the ability to flag applications as Games in the manifest,
so they can receive a different treatment in the UI.

Change-Id: I4c36bc1a96757030fad58ee050cd68491b31bb6c
 2014-03-21 15:14:45 -07:00
Chad Brubaker
9506e84b6f am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'c77261471432e1577586395dd0a6a481ef7431b5':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:09:41 +00:00
Chad Brubaker
c772614714 am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-21 21:02:43 +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
7bde0fc751 am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
  Change wallpaper sizing
 2014-03-21 19:17:01 +00:00
Unsuk Jung
2270ac96d5 am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
 2014-03-21 19:11:01 +00:00