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

12772 Commits

Author SHA1 Message Date
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
94825a16e0 Track libcore change 2729b8c4d26170. 
test-current.txt was regenerated on nyc-dev.

bug: 27423298

(cherry picked from commit b16a96538aa735c6926a95250fde2eca4b8e38ad)

Change-Id: Ieba7afaff407a421d3c2430f243151857cb42f97
 2016-03-02 14:18:30 +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 f6c9dc9594cf16c6e148498cabd793f8affa76e9)
 2016-03-01 20:48:50 -08:00
Keun-young Park
078f9b9813 Revert "Revert "make isUiModeLocked, isNightModeLocked test api"" 
This reverts commit 92373d23ee13a3d017ee8570229eed164935cd35.

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 b493a7dffe1b40fd7d5c22b8ed340c76918bc56b.

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
Keun-young Park
705e467a77 Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev am: 63f2c9b0cb 
am: 614955d3f9

* commit '614955d3f94c14d4761d64b9bcb15fb99e67a8ee':
  make isUiModeLocked, isNightModeLocked test api
 2016-03-01 19:59:03 +00:00
Abhijith Shastry
35293d2ff7 Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev 2016-03-01 19:56:06 +00:00
Jakub Pawlowski
b73ebc88d9 Hide android.bluetooth.OobData 
Bug: 27385555
Change-Id: I1767909ca17b1b23a2f23ea4a5b4a02cc52eecde
 2016-03-01 11:00:33 -08:00
Keun-young Park
63f2c9b0cb Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev 2016-03-01 18:37:57 +00:00
Dongwon Kang
b55c7517ba TIF: Address API review comments 
Bug: 27386052
Change-Id: I242819e0817723e247b8fe646d534899ab50af76
 2016-03-01 10:03:58 -08:00
Przemyslaw Szczepaniak
3f4012a05d Track change 02072325e0133d78cc575732a0762ed3da0242a7 am: 933c1d48bc 
am: 02f8279a32

* commit '02f8279a3299e0b93da5d5fae5b0c241675e2e1f':
  Track change 02072325e0133d78cc575732a0762ed3da0242a7
 2016-03-01 17:41:42 +00:00
Narayan Kamath
770ab9586f Merge "Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e." into nyc-dev am: 6839f4c5f4 
am: dd5faf0678

* commit 'dd5faf0678017b293469265c6cb6f3235bddac79':
  Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e.
 2016-03-01 17:35:50 +00:00
Przemyslaw Szczepaniak
933c1d48bc Track change 02072325e0133d78cc575732a0762ed3da0242a7 
Bug: 27404545
Change-Id: I51b1e7239d456f0ec1d0bdc6b54761aeb44368d9
 2016-03-01 17:22:07 +00:00
Narayan Kamath
24825ff421 Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e. 
bug: 26704777
Change-Id: Ib448d90fdf0200d77df9cbb8930a904fbe3374ca
 2016-03-01 17:18:58 +00:00
Ronghua Wu
3f550f5e5b Merge "media: define HEVCProfileMain10HDR10" into nyc-dev am: 78614f7714 
am: 91b01d6c4e

* commit '91b01d6c4eefaed20632b8320eea50566ab49bf8':
  media: define HEVCProfileMain10HDR10
 2016-03-01 16:41:24 +00:00
Ronghua Wu
78614f7714 Merge "media: define HEVCProfileMain10HDR10" into nyc-dev 2016-03-01 16:35:22 +00:00
Todd Kennedy
a67932374d Revert "Revert "Remove deprecated methods / classes"" 
This reverts commit 5cbeb5902633646fbc0a1be252081e77aaaee7b4.

Change-Id: Id96010364d65e6131221ebbcc8ce5889a2da256c
 2016-03-01 07:19:33 -08:00
Julia Reynolds
e03aba3b19 Merge "Api review: AutomaticZenRule" into nyc-dev am: 2319dd3a66 
am: 84c0cf5baf

* commit '84c0cf5baf35bf314c0f69397adacb6a4376102e':
  Api review: AutomaticZenRule
 2016-03-01 15:11:18 +00:00
Julia Reynolds
2319dd3a66 Merge "Api review: AutomaticZenRule" into nyc-dev 2016-03-01 15:05:36 +00:00
Abhijith Shastry
6701be428c Add deprecated annotation to launchManageBlockedNumbersActivity API. 
BUG: 27364137
Change-Id: I0c5c05042e6bc05a605613bde7ba3c579c1858ed
 2016-02-29 16:31:12 -08:00
Abhijith Shastry
f7c39a6219 Merge "Updates to BlockedNumberContract from API review." into nyc-dev am: b7ed5b074d 
am: 401a811c29

* commit '401a811c297c5fdedefb8521616fcdf741cd1ed0':
  Updates to BlockedNumberContract from API review.
 2016-03-01 00:26:08 +00:00
Jeff Sharkey
3541354007 Merge "Parcelable classes should always be final." into nyc-dev am: 753c347efd 
am: 620ef3f226

* commit '620ef3f22654676cd37df23db059a71e0607d6a9':
  Parcelable classes should always be final.
 2016-03-01 00:12:20 +00:00
Abhijith Shastry
b7ed5b074d Merge "Updates to BlockedNumberContract from API review." into nyc-dev 2016-03-01 00:08:01 +00:00
Jeff Sharkey
753c347efd Merge "Parcelable classes should always be final." into nyc-dev 2016-03-01 00:02:43 +00:00
Jeff Sharkey
50d1c044b5 Parcelable classes should always be final. 
Also hide ConnectivityMetricsEvent which isn't being used yet.

Bug: 27415331
Change-Id: Iacdccddda504f3f669185f807b4f35b8dc2b0212
 2016-02-29 16:46:09 -07:00
Abhijith Shastry
575a9492bb Updates to BlockedNumberContract from API review. 
Javadoc updates are also included.

BUG: 27364137
Change-Id: Id99b5c0fadd2a62a33217b44c7f30dd2f3beb9be
 2016-02-29 15:44:05 -08:00
Pablo Ceballos
a33e24b1f6 Merge "Fix glGetTransformFeedbackVarying JNI" into nyc-dev am: 86a27f343c 
am: 8d63b8690e

* commit '8d63b8690ef5c3240cd04e20a7822688dbc80864':
  Fix glGetTransformFeedbackVarying JNI
 2016-02-29 23:08:32 +00:00
Pablo Ceballos
86a27f343c Merge "Fix glGetTransformFeedbackVarying JNI" into nyc-dev 2016-02-29 22:58:56 +00:00
Abhijith Shastry
98d9edd536 Merge "Add new API to create an intent to manage blocked numbers." into nyc-dev am: 1ce163fe34 
am: 4726e13283

* commit '4726e13283ea2db17aa4dbe884e210f82a4c36c6':
  Add new API to create an intent to manage blocked numbers.
 2016-02-29 21:17:12 +00:00