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

12828 Commits

Author SHA1 Message Date
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
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 7d18ce744fff219ab60470ec095d585b854b91e1)

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 7d18ce744fff219ab60470ec095d585b854b91e1)

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 de33c660df4a6ff8a138e3033c9e1d446bd6b570)

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
Lajos Molnar
4ab9756906 Merge "media: Add track ID format key" into nyc-dev 2016-03-03 16:14:26 +00:00
Lajos Molnar
6ef0ac3278 media: Add track ID format key 
Bug: 25684127
Change-Id: I574515c3c144f5cabe4f40d934d062de1dd20851
 2016-03-03 16:12:52 +00:00
Narayan Kamath
84f19f00a7 Track libcore change 2c423c81bfa731df2577a. am: 34bfcf1fdf 
am: a8bd2c3e25

* commit 'a8bd2c3e25c76b92d7706ef09ded6b3e3a041f3f':
  Track libcore change 2c423c81bfa731df2577a.
 2016-03-03 11:58:24 +00:00
Narayan Kamath
8154265445 Merge "Track libcore change 2c423c81bfa731df2577a." am: a1fd14328e am: b47dc2032b 
am: 298d83f016

* commit '298d83f016b8ada930fd59d11b17bcf275d42b5f':
  Track libcore change 2c423c81bfa731df2577a.
 2016-03-03 11:56:25 +00:00
Narayan Kamath
298d83f016 Merge "Track libcore change 2c423c81bfa731df2577a." am: a1fd14328e 
am: b47dc2032b

* commit 'b47dc2032bf247e3764254ba1409a1b081953986':
  Track libcore change 2c423c81bfa731df2577a.
 2016-03-03 11:52:38 +00:00
Narayan Kamath
34bfcf1fdf Track libcore change 2c423c81bfa731df2577a. 
Also includes a regenerated test-current.txt.

bug: 27423298

(cherry picked from commit a1becdc6982d770737d6b56f974c4f5beb244076)

Change-Id: Iaa385947af79cee7b0fa1cde10d106411e2f67d2
 2016-03-03 11:41:36 +00:00
Christopher Tate
41d41c3622 Merge "Add API to clear a specific wallpaper" into nyc-dev am: d493ed6c0c 
am: 06cfa553e3

* commit '06cfa553e3da6f13daa42a045bb1abf8aa89cbfc':
  Add API to clear a specific wallpaper
 2016-03-03 02:29:02 +00:00
Lifu Tang
a7e71700b4 Merge "Addressed the review comments from API Council" into nyc-dev am: 99a4966ed7 
am: b11601fa53

* commit 'b11601fa53970971f9b84a3a4933412145afe4d7':
  Addressed the review comments from API Council
 2016-03-03 02:11:42 +00:00
Dianne Hackborn
d98885c128 Add APIs to find out the time when a process was created. 
Change-Id: Id0d12c377f278fec6e31a98eab0c865a23c006ec
 2016-03-02 17:40:52 -08:00
Chris Tate
d493ed6c0c Merge "Add API to clear a specific wallpaper" into nyc-dev 2016-03-03 01:30:35 +00:00
Christopher Tate
79a2457e19 Add API to clear a specific wallpaper 
There was previously no public API for clearing the keyguard wallpaper
versus the system wallpaper, or both.  Now there is.

Bug 27400185

Change-Id: If1789dd430040acdf16d77413c0e4b46bf3789f3
 2016-03-02 17:05:25 -08:00
Selim Gurun
12a563f457 Merge "Revert "Add some View methods overrides and WebViewDelegate interfaces."" 2016-03-03 00:52:39 +00:00
Selim Gurun
7ef5429637 Revert "Add some View methods overrides and WebViewDelegate interfaces." 
This reverts commit 73a7494231c95b53f65612e9fdd9b5aef506244e.

Change-Id: I3a403c224a074cfc9952d3b421027c9538eaa30b
 2016-03-03 00:52:11 +00:00
Lifu Tang
99a4966ed7 Merge "Addressed the review comments from API Council" into nyc-dev 2016-03-03 00:48:39 +00:00
Lifu Tang
76a620f048 Addressed the review comments from API Council 
Following are the review comments from API Council:

(Places below that reference "s/foo/bar/" below are suggesting that "foo" be
 replaced with "bar".)

GnssClock
-- Class docs should not refer to "GPS" at the top level
-- s/InNs/Nanos/
-- s/Sec/Second/

GnssMeasurement
-- s/In// for "InUnitname"
-- s/Sec/Second/
-- s/Ms/Millis/
-- s/Deg/Degrees/
-- STATUS_GPS_LOCATION_DISABLED -> STATUS_GNSS_LOCATION_DISABLED

GnssMeasurementsEvent.Callback
-- "returns" -> "reports" in the method docs as the methods return void

LocationManager
-- register/unregisterGnssMeasurementEventCallback ->
   register/unregisterGnssMeasurementsEventCallback (plural)

GnssNavigationMessage
-- MESSAGE_TYPE_ constants -> change to just TYPE_; the "MESSAGE" is redundant
   with the class name
-- is a signed byte/short ok based on the standard here? If not consider using
   int in the public api

GnssStatus
-- Make sure @IntDef exists for the constellation type
-- Please append unit types for values returned to match GnssMeasurement methods

GnssStatusCallback
-- Please document time base/units for the time parameter of onFirstFix

Bug: 27385557
Change-Id: Ifed6a2eca3fd7ba89b3ded6964a70376235af8f4
 2016-03-02 16:41:47 -08:00
Jean-Michel Trivi
28ff76b455 API changes for audio recording notifications 
Make AudioRecordConfiguration final since it is parcelable.
In AudioRecordingCallback, pass the array of active recording
  configurations.
Add @IntDef for return values for
  AudioRecordConfiguration.getClientAudioSource()

Bug 27385560

Change-Id: I01193577f50e50496742d888b45f89a2c3b67904
 2016-03-02 14:40:03 -08:00
Jeremy Joslin
e9e6083ee1 Revert "New systemapi to mark a wifi network as metered." 
This reverts commit 7a598d3d800fc47b7c2f9300411edc0ef06da493.

Change-Id: Ib6b9081ee4ded7582fb90d7a9066de95ab221f61
 2016-03-02 22:16:27 +00:00
Keun-young Park
19f517777b Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev am: 98e386f650 
am: b023406ab4

* commit 'b023406ab466224f6f8c8fc2c0f2c3717435a18d':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:36:13 +00:00