Commit Graph

12801 Commits

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

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 73a7494231.

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
Jeremy Joslin
e9e6083ee1 Revert "New systemapi to mark a wifi network as metered."
This reverts commit 7a598d3d80.

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
Keun-young Park
98e386f650 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 2016-03-02 17:12:42 +00:00
Narayan Kamath
cd9915884d Merge "Track libcore change 2729b8c4d26170." into nyc-dev am: 9d0aa47c65
am: 09b59e113d

* commit '09b59e113d571e0d6bf0bc8eaf06620bfa86d96d':
  Track libcore change 2729b8c4d26170.
2016-03-02 14:55:13 +00:00
Narayan Kamath
a1becdc698 Track libcore change 2c423c81bfa731df2577a.
bug: 27423298
Change-Id: Ibc5094812af4446ac6ff25158ca4dd0ce8271e2a
2016-03-02 14:30:08 +00:00
Narayan Kamath
94825a16e0 Track libcore change 2729b8c4d26170.
test-current.txt was regenerated on nyc-dev.

bug: 27423298

(cherry picked from commit b16a96538a)

Change-Id: Ieba7afaff407a421d3c2430f243151857cb42f97
2016-03-02 14:18:30 +00:00
Narayan Kamath
b16a96538a Track libcore change 2729b8c4d26170.
bug: 27423298

Change-Id: I2d2eedd108896d5a027f06e159222a41bdcb3cb5
2016-03-02 13:41:32 +00:00
Jeff Sharkey
308b9b3739 Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev am: 85f2ded23e
am: d6a632bd2e

* commit 'd6a632bd2e1a06ad4b91388f66e440a829d5791e':
  Sometimes to step forward, we need to go back. [2/2]
2016-03-02 06:26:58 +00:00
Jeff Sharkey
4ac7f0391e Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev am: 888de830ed
am: 24f4adb70f

* commit '24f4adb70fb16a0d9e7a6ec784623c53881586cd':
  Sometimes to step forward, we need to go back. [1/2]
2016-03-02 06:23:59 +00:00
Svetoslav Ganov
0a21d65d04 Merge "API for safe label to present in the UI" into nyc-dev am: 6cc1ba8e17
am: d36d11f232

* commit 'd36d11f2323dbb28c3885b4a49ebc5b73712b35d':
  API for safe label to present in the UI
2016-03-02 06:08:51 +00:00
Anna Galusza
acf9b1394f Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143" into nyc-dev am: 2e36a9e1c7
am: e853ceb080

* commit 'e853ceb080df09bb22a3f8c28441a0d61068b0ce':
  Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143
2016-03-02 06:06:18 +00:00
Keun-young Park
93f0d5d29c Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev am: 8486706aff
am: 765415a766

* commit '765415a76624ce2e041ef814039bdb1693e3d2b8':
  Revert "make isUiModeLocked, isNightModeLocked test api"
2016-03-02 05:55:09 +00:00
Brian Carlstrom
21f30ba180 Merge "Merge "TIF: Address API review comments" into nyc-dev am: 9cd89a403e" 2016-03-02 05:06:12 +00:00
Todd Kennedy
1d67f35132 Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev am: 4f858aaa5a
am: d509acbf45

* commit 'd509acbf45a5f9af931c50dc0e69cc99c876e648':
  Revert "Revert "Remove deprecated methods / classes""
2016-03-02 05:03:03 +00:00
Dongwon Kang
176facba14 Merge "TIF: Address API review comments" into nyc-dev
am: 9cd89a403e

* commit '9cd89a403e60f6be665a6068be76b805c8b83402':
  TIF: Address API review comments

(cherry picked from commit f6c9dc9594)
2016-03-01 20:48:50 -08:00
Keun-young Park
078f9b9813 Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
This reverts commit 92373d23ee.

Change-Id: Idf0c3f1d3bed522142f8af3526effe813664d89f
2016-03-02 02:18:19 +00:00
Jakub Pawlowski
76033a5638 Merge "Hide android.bluetooth.OobData" into nyc-dev am: ecc873d5ee
am: 9a622515b7

* commit '9a622515b785e618bab204839b702628104beb74':
  Hide android.bluetooth.OobData
2016-03-02 01:57:23 +00:00
Abhijith Shastry
0afec78578 Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev am: 35293d2ff7
am: 2d54a7e49c

* commit '2d54a7e49c734b7c2d7911fd98504fa46ad8d101':
  Add deprecated annotation to launchManageBlockedNumbersActivity API.
2016-03-02 01:43:15 +00:00
Jeff Sharkey
fa6a1bc755 Sometimes to step forward, we need to go back. [2/2]
Change-Id: Iccabb95530a6e3c3950cb9a8dfe84e75354d2f5f
2016-03-01 17:36:23 -07:00
Jeff Sharkey
9ad443f59c Sometimes to step forward, we need to go back. [1/2]
Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a
2016-03-01 17:28:36 -07:00
Svetoslav Ganov
6cc1ba8e17 Merge "API for safe label to present in the UI" into nyc-dev 2016-03-01 23:42:20 +00:00
Anna Galusza
2e36a9e1c7 Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143" into nyc-dev 2016-03-01 23:39:09 +00:00
Keun-young Park
8486706aff Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev 2016-03-01 22:59:14 +00:00
Keun-young Park
92373d23ee Revert "make isUiModeLocked, isNightModeLocked test api"
This reverts commit b493a7dffe.

Change-Id: I651b7ee5b9ca5d7fa1cde1c625bbaa585e186544
2016-03-01 22:58:15 +00:00
Svetoslav Ganov
aa8b0d74f4 API for safe label to present in the UI
bug:23531798

Change-Id: Ic3e0ed3db11445dbc5e562ca1a91b181ec5f2553
2016-03-01 14:31:39 -08:00
Dongwon Kang
9cd89a403e Merge "TIF: Address API review comments" into nyc-dev 2016-03-01 22:11:47 +00:00
Anna Galusza
3204251a4a Throw exception from SoftKeyboardController if connection is dead and declare
SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class.
Bug: 27364143

Change-Id: I02c23fbfab1eae8b2a155b1d9c3857e4eb6addb1
2016-03-01 12:40:19 -08:00
Todd Kennedy
4f858aaa5a Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev 2016-03-01 20:39:59 +00:00
Jakub Pawlowski
ecc873d5ee Merge "Hide android.bluetooth.OobData" into nyc-dev 2016-03-01 20:04:34 +00:00