Daichi Hirono
3a10365583
Merge "Add a new key to Settings.Global to obtain the number of boot." into nyc-dev am: d517e6aeed
...
am: e07d5b62ed
* commit 'e07d5b62ed6d58f8f81383e6ecde03b1181e08f3':
Add a new key to Settings.Global to obtain the number of boot.
2016-03-08 02:16:09 +00:00
Daichi Hirono
d517e6aeed
Merge "Add a new key to Settings.Global to obtain the number of boot." into nyc-dev
2016-03-08 02:06:39 +00:00
Amit Mahajan
619ebe712b
Merge "New permission for bypassing premium short code check." into nyc-dev am: 0f90653ca1
...
am: bcbdfbb50b
* commit 'bcbdfbb50bf9ea0f66c458029dfae6eccec2fb1a':
New permission for bypassing premium short code check.
2016-03-08 01:22:26 +00:00
Amit Mahajan
0f90653ca1
Merge "New permission for bypassing premium short code check." into nyc-dev
2016-03-08 01:13:53 +00:00
Ruben Brunk
dbd8a7ac40
Merge "Add a VR listener service." into nyc-dev am: 875825d0c1
...
am: f05c96989c
* commit 'f05c96989cf1bd028cc7d63d31b4cab37ad3b9f2':
Add a VR listener service.
2016-03-08 00:27:39 +00:00
Ruben Brunk
875825d0c1
Merge "Add a VR listener service." into nyc-dev
2016-03-08 00:14:57 +00:00
Ruben Brunk
e24b9a6cfa
Add a VR listener service.
...
Bug: 22855417
Bug: 26724891
Bug: 27364145
- Add an API for VrListenerService, which is bound/unbound
from the framework when the system VR mode changes.
- Allow only a single bound VrListenerService at a time.
- Monitor allowed VrListenerService implementations from
VrManagerService and evict services as needed when packages,
users, or settings change.
- Remove previous VR functionality in NotificationListenerService.
- Add component target to Activity#setVrMode to allow
explicit selection of the running VrListenerService from
the current VR activity.
Change-Id: I776335f4441be0e793d3126f2d16faf86a8c621a
2016-03-07 15:54:12 -08:00
Amit Mahajan
e5cd9fa439
New permission for bypassing premium short code check.
...
Bug: 18326557
Change-Id: I1b05f73103183b851bbef1280d0785ce0a48159a
2016-03-07 21:51:44 +00:00
Jean-Michel Trivi
fb7a388b9d
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
am: 4f9c05c382
* commit '4f9c05c3823ea73b17fb6b14707dc2ce3f9d760c':
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
2016-03-07 21:11:44 +00:00
Jean-Michel Trivi
4f9c05c382
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72 .
Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
(cherry picked from commit 431ec6cdb9 )
2016-03-07 21:00:25 +00:00
Jean-Michel Trivi
310355d28e
Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev
2016-03-07 19:59:42 +00:00
Jean-Michel Trivi
431ec6cdb9
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72 .
Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
2016-03-07 19:59:21 +00:00
Jean-Michel Trivi
cffe9145ec
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 46f5429768
...
am: b4a08fbd00
* commit 'b4a08fbd00d631f8f2508915e9d04c0ed9650d16':
Rename AudioRecordConfiguration to AudioRecordingConfiguration
2016-03-07 19:53:33 +00:00
Jeff Tinker
a531724c88
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev am: b849eeab26
...
am: d83f4fc837
* commit 'd83f4fc837cf344c81def1284aa1af8757703b3e':
Add error code to MediaCodec.CryptoException
2016-03-07 19:42:11 +00:00
Jean-Michel Trivi
46f5429768
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev
2016-03-07 19:29:04 +00:00
Jeff Tinker
b849eeab26
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev
2016-03-07 18:18:10 +00:00
Daichi Hirono
82ab9801eb
Add a new key to Settings.Global to obtain the number of boot.
...
BUG=26212981
Change-Id: I5ca51ca624a30dc2d96e547a85a712e273af1931
2016-03-07 12:45:19 +09:00
Jeff Sharkey
130b5bc14c
Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev am: d6de3abed9
...
am: 24219954ec
* commit '24219954ec49dfdc4ae4d10571ecc02e67a7272b':
Add AssetFileDescriptor to MediaExtractor.
2016-03-05 23:17:14 +00:00
Jeff Sharkey
d6de3abed9
Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev
2016-03-05 23:09:25 +00:00
Jeff Sharkey
a3c1c2297d
Add AssetFileDescriptor to MediaExtractor.
...
Mirrors API on MediaPlayer.
Bug: 27506874
Change-Id: Ibc07cf8151c362ff7375b89e7a9044bef1d9e94d
2016-03-05 16:07:46 -07:00
Jeff Tinker
d393216f8a
Add error code to MediaCodec.CryptoException
...
Added a code to represent unsupported operations
bug: 25929554
Change-Id: Id8bfa092f29de073db19c4d7444f89249ea2cdd5
2016-03-05 11:53:23 -08:00
Jean-Michel Trivi
46ef3bdf28
Merge "API changes for audio recording notifications" into nyc-dev am: b74926232e
...
am: 6bc51e0e5c
* commit '6bc51e0e5cb318bc9c1c92a1f70a434614a741fc':
API changes for audio recording notifications
2016-03-04 22:56:10 +00:00
Jean-Michel Trivi
b74926232e
Merge "API changes for audio recording notifications" into nyc-dev
2016-03-04 22:49:31 +00:00
Julia Reynolds
3ab8f45ff8
Api Review: NotificationManager.Policy am: cedacefd70
...
am: 9cda0f2b31
* commit '9cda0f2b31c789ccac5e3cca55fbfcc3f5aa1cb7':
Api Review: NotificationManager.Policy
2016-03-04 19:47:11 +00:00
Julia Reynolds
cedacefd70
Api Review: NotificationManager.Policy
...
Bug: 27365873
Change-Id: Ie53a410d53f430fa90f24d95a885be150a3d66aa
2016-03-04 14:37:45 -05:00
Narayan Kamath
64bf195185
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2). am: cda4198937
...
am: a6752e50d9
* commit 'a6752e50d99c82c963799be682fd5f0759ea1b0e':
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2).
2016-03-04 13:30:04 +00:00
Narayan Kamath
cda4198937
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2).
...
Also includes a regenerated test-current.txt.
bug: 27426688
(cherry picked from commit 7d18ce744f )
Change-Id: I754803d51d365ac1fe26c638b12efb88d23b35c6
2016-03-04 13:24:13 +00:00
Narayan Kamath
766c0ed5c7
Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." am: 61d71016a9 am: 13232345bb
...
am: 1e54b5fac2
* commit '1e54b5fac21c6bb29a67dbdbcca8c0472ae9b4b4':
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
2016-03-04 13:03:50 +00:00
Narayan Kamath
1e54b5fac2
Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." am: 61d71016a9
...
am: 13232345bb
* commit '13232345bbd6042b7f27dad51f2df164c44330f4':
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
2016-03-04 13:01:41 +00:00
Narayan Kamath
6442a0cc8d
Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24. am: 6f9845ce85
...
am: 4cf9f9d877
* commit '4cf9f9d87761b0a3b2d0b1462ab237420df45f37':
Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
2016-03-04 12:49:25 +00:00
Narayan Kamath
3e7ef62e04
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
...
bug: 27426688
(cherry picked from commit 7d18ce744f )
Change-Id: If22e493a80958ebd57ae5cc9d0f74d9479c86211
2016-03-04 12:46:37 +00:00
Narayan Kamath
7d18ce744f
Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
...
bug: 27426688
Change-Id: I75777707f96c463ea7054eda55bb532a67ca5501
2016-03-04 12:45:05 +00:00
Narayan Kamath
6f9845ce85
Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
...
Includes generated changes for test-current.txt.
bug: 27426688
(cherry picked from commit de33c660df )
Change-Id: Idd323fe7458a2b124aae0009b4de83039e2ade21
2016-03-04 11:56:49 +00:00
Steve McKay
49890efeb8
Merge "Make COLUMN_CAPACITY_BYTES public." into nyc-dev am: 75b19dd208
...
am: 1f1e4bd8d0
* commit '1f1e4bd8d02cf2717ab3692eb315d657588b730f':
Make COLUMN_CAPACITY_BYTES public.
2016-03-04 02:20:27 +00:00
Steve McKay
75b19dd208
Merge "Make COLUMN_CAPACITY_BYTES public." into nyc-dev
2016-03-04 02:12:02 +00:00
The Android Automerger
1ccd57a91c
Merge commit '22e01d5611d14cc04055b8abcbd1e8c114a0853c'
2016-03-04 01:05:11 +00:00
Ji Yang
06af8cd84f
Merge "New CarrierMessagingService API for sms filtering" into nyc-dev am: 456b9620f0
...
am: 20771666db
* commit '20771666db3b55ad912816e4f195169cd0bb5fb5':
New CarrierMessagingService API for sms filtering
2016-03-04 00:06:15 +00:00
Roozbeh Pournader
fa207d6097
Merge "Unhide LocaleList.getAdjustedDefault()" into nyc-dev
2016-03-03 23:46:57 +00:00
Todd Kennedy
dfa93abf2f
Fix javadoc
...
Make referenced constants @SystemApi and change argument name to
match its actual meaning.
bug: 25441401
Change-Id: I4277799b95f394edb4305be05f57437717a86691
2016-03-03 15:24:33 -08:00
Narayan Kamath
de33c660df
Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
...
bug: 27426688
Change-Id: I0ac1dd9a1632b42235744602e9384b8049556965
2016-03-03 22:23:37 +00:00
Roozbeh Pournader
5a06c663b5
Unhide LocaleList.getAdjustedDefault()
...
Apps/libraries/widgets that wish to display text their own way (think
WebView/Chrome) or do some resource management themselves should be
able to use LocaleList.getAdjustedDefault(), the same way we use it
in Paint and Resources.
Bug: 26988869
Change-Id: I4b6aac7adb5da15459dca92574923f33f0702433
2016-03-03 14:20:52 -08:00
Steve McKay
7542f751e3
Make COLUMN_CAPACITY_BYTES public.
...
So providers can tell us total capacity.
Change-Id: Id990c417fcae4c6beee3e09dcb633b22e875e08f
2016-03-03 13:35:30 -08:00
Ji Yang
456b9620f0
Merge "New CarrierMessagingService API for sms filtering" into nyc-dev
2016-03-03 21:10:46 +00:00
Ji Yang
a8c9c6c593
New CarrierMessagingService API for sms filtering
...
Add a new sms filtering method to let the carrier app tell
the platform to keep the message while keep it invisible to
the end user.
BUG: 27292180
Change-Id: I306a7dbde6dcb9929e358b3d1bbda9807ef35943
2016-03-03 13:07:13 -08:00
Dianne Hackborn
04d1031b8d
Merge "Add APIs to find out the time when a process was created." into nyc-dev am: ef1971ffc5
...
am: 623ebce5fb
* commit '623ebce5fb9041968c324b418e029df85b13b61e':
Add APIs to find out the time when a process was created.
2016-03-03 20:43:17 +00:00
Dianne Hackborn
ef1971ffc5
Merge "Add APIs to find out the time when a process was created." into nyc-dev
2016-03-03 19:47:56 +00:00
Jeremy Joslin
6e470ae38e
Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev am: 3f7314e331 am: b94df9db50
...
am: 42ed2d0609
* commit '42ed2d0609b75460a4a29da7b08dce7dfd0f9169':
Revert "New systemapi to mark a wifi network as metered."
2016-03-03 17:02:59 +00:00
Jeremy Joslin
b94df9db50
Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev
...
am: 3f7314e331
* commit '3f7314e3310fbaddc984ae3218f7bb22f13cda11':
Revert "New systemapi to mark a wifi network as metered."
2016-03-03 16:54:28 +00:00
Jeremy Joslin
3f7314e331
Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev
2016-03-03 16:49:28 +00:00
Lajos Molnar
2eb0376310
Merge "media: Add track ID format key" into nyc-dev am: 4ab9756906
...
am: 03b81e8084
* commit '03b81e8084d7785e68b4bb80d799dbf4b0d40a14':
media: Add track ID format key
2016-03-03 16:20:35 +00:00