Katie McCormick
fb19fc61f2
am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
Doc Update: revert PendingIntent fix.
2014-04-01 00:21:34 +00:00
Katie McCormick
905a5b1477
am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
Doc Update: revert PendingIntent fix.
2014-04-01 00:15:52 +00:00
Katie McCormick
87d9d1a040
Doc Update: revert PendingIntent fix.
...
Original fix was in error. Reverting. See:
b/10641568
Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
2014-03-31 16:18:15 -07:00
Zhihai Xu
7d394df2ab
am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde
Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
2014-03-31 21:21:54 +00:00
Brian Carlstrom
7156b7c65d
am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
...
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 19:59:31 +00:00
Brian Carlstrom
ff9ca781d0
Improve detail message for X509TrustManagerExtensions argument validation
...
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
2014-03-31 11:22:34 -07:00
Wei Wang
1b09c97d8a
am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709
Callback on correct method when status is unsuccessful.
...
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
Michael Wright
5d7db503bd
am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Jeff Hao
f1354dd206
am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
...
* commit 'd648e5f7ba26fc835c0448740f33c49874d51a3b':
Mark constructor as accessible in LayoutInflater.
2014-03-28 23:05:46 +00:00
Michael Wright
d08c864784
Add InputDevice#supportsSource(int).
...
This mirrors the InputEvent#isFromSource API.
Change-Id: Ie4869cc52d22d49a71d4d3e22f1ae38b16367395
2014-03-28 12:59:34 -07:00
John Spurlock
ec27a7caf3
am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api.
...
* commit '5579ec33eb317a19ad80929169b2b329b147d98b':
DO NOT MERGE Enhance the NotificationListenerService api.
2014-03-28 19:01:10 +00:00
Jeff Hao
e3abd2ccbe
Mark constructor as accessible in LayoutInflater.
...
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
2014-03-28 11:33:53 -07:00
John Spurlock
5579ec33eb
DO NOT MERGE Enhance the NotificationListenerService api.
...
Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void
Add to StatusBarNotification:
- getKey() : String
Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
2014-03-28 10:19:00 -04:00
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
Kenny Root
1dc1d6b22d
am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
...
* commit '5b93685af37d840e7ef6d415bcfe8a8a4c004032':
CertificateChainValidator: initialize TrustManagerFactory
2014-03-27 00:10:41 +00:00
Michael Wright
1b10869f39
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
...
Also change MotionEvent.PointerCoords bit packing and unpacking
methods to be consistent with BitSets which are now used on the
native PointerCoords object.
Bug: 11480300
Change-Id: Ib18c99b94ac555104c69eac526860aa501e89e03
2014-03-26 14:56:07 -07:00
Michael Wright
1e3c93975e
Adds API for determining confirm and cancel keys.
...
Bug: 13624048
Change-Id: I9f42eeb9c3a6bdae35eb0d7213fb4ac0fd8dc0d9
2014-03-26 14:40:42 -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
Andre Eisenbach
580b0a1302
LE: Add API to configure MTU for a given connection (3/4)
...
bug:13571470
Change-Id: I3619617eaf864701a35f7802bc71805784d768d0
2014-03-25 18:02:06 -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