Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,853 Commits 3 Branches 0 Tags
68d43e275efae8f7b83388ea6fdebbcf5cd1504f
Commit Graph

33130 Commits

Author SHA1 Message Date
Kenny Root
1dc1d6b22d am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '5b93685af37d840e7ef6d415bcfe8a8a4c004032':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-27 00:10:41 +00: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
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
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
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
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
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
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
Alex Klyubin
92ec0a0c7a 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:47:27 +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
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 824a4b5ea4)
 2014-03-21 10:29:27 +00:00
Jinsuk Kim
f2fecf48f7 am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
  Add HDMI-CEC service
 2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Wei Wang
331ef6127c am 32779536: 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 '32779536bcd66d45019f4ab80dd0d844e618e16b':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 17:05:20 +00:00
Wei Wang
32779536bc 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:59:13 +00:00
Wei Wang
6c9385b13c am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit 'd10bc171a5abb8ddecd8a4888fa8833986f8d8ee':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 16:24:09 +00:00
Jinsuk Kim
4f512fb451 Add HDMI-CEC service 
This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages

Not all the messages are in place. Currently it has messages to support
a few features only, as follows:

- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status

It will be extended to cover the wider usages in the follow up CLs.

The CEC standard version referenced in the implementation is 1.3a.

Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
 2014-03-20 16:40:22 +09: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
d10bc171a5 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 03:36:45 +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
Jeff Brown
5693d40360 am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '96abebd02559137fa320a17c5b7a985d6fc068ba':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:16:18 +00:00
Jeff Brown
96abebd025 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
Robert Greenwalt
45b1e5ec05 am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:13:00 +00:00