Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,840 Commits 3 Branches 0 Tags
f2aec548c325e52cd1126f059fa0ea2e1952ed2c
Commit Graph

13114 Commits

Author SHA1 Message Date
Tyler Gunn
ca61ed42fd Merge "Correct naming issues with video calling carrier config items." into nyc-dev am: dfc1ee0 
am: 2e9438a

* commit '2e9438ad2b029feb3c4c0b1aff9ca1ec0b262ba2':
  Correct naming issues with video calling carrier config items.
 2016-03-21 18:42:20 +00:00
Tyler Gunn
2e9438ad2b Merge "Correct naming issues with video calling carrier config items." into nyc-dev 
am: dfc1ee0

* commit 'dfc1ee0162f6ee4b18c573f2d0d59001d0447f1a':
  Correct naming issues with video calling carrier config items.
 2016-03-21 18:39:48 +00:00
Tyler Gunn
dfc1ee0162 Merge "Correct naming issues with video calling carrier config items." into nyc-dev 2016-03-21 18:37:09 +00:00
Teng-Hui Zhu
7318a26360 Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev am: 68e5b96 
am: a9c417e

* commit 'a9c417e87e2ff118184a2250ae314e45084e5ca4':
  API review: Hide ComplexColor and GradientColor
 2016-03-21 18:27:54 +00:00
Teng-Hui Zhu
a9c417e87e Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev 
am: 68e5b96

* commit '68e5b9601a9730dfccc5ce8412be3fbe087a3bfc':
  API review: Hide ComplexColor and GradientColor
 2016-03-21 18:25:22 +00:00
Tenghui Zhu
68e5b9601a Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev 2016-03-21 18:19:54 +00:00
Teng-Hui Zhu
e03c469fd4 API review: Hide ComplexColor and GradientColor 
b/27532267

Change-Id: I01582e067ec8f4897c34dcec0f7c14700c40e02b
 2016-03-21 11:09:16 -07:00
Siyamed Sinir
a73a27cc14 New Linkify.addLinks function with set of known schemes am: 6eccafd 
am: bb30fbb

* commit 'bb30fbb565221d3d792694b8ffd378b87083ba6c':
  New Linkify.addLinks function with set of known schemes
 2016-03-21 17:39:48 +00:00
Siyamed Sinir
bb30fbb565 New Linkify.addLinks function with set of known schemes 
am: 6eccafd

* commit '6eccafd3394f977d44c329dc75eb12739a818f4b':
  New Linkify.addLinks function with set of known schemes
 2016-03-21 17:35:40 +00:00
Siyamed Sinir
6eccafd339 New Linkify.addLinks function with set of known schemes 
A new addLinks function is added that accepts a default scheme and a
set of known schemes. Default scheme is applied whenever the link found
does not start with one of the given known schemes.

Moreover, previously JavaDoc for addLinks functions with a single scheme
parameter described that the scheme attribute will be prepended to the
links that do not have 'a' scheme. The code actually checks if the link
starts with the given scheme and prepends if not. JavaDoc updated
accordingly.

Bug: 26985901
Change-Id: I94ea81dcf83ba7a6b6cd47c10fe8fb277964eb15
 2016-03-21 10:27:31 -07:00
Victor Chang
40240b17c9 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev am: d3c0cf5 
am: 6918dbc

* commit '6918dbc87144d273fae62dae7c524993f0cbba7b':
  Api change of DPM.setApplicationRestrictionsManagingPackage()
 2016-03-21 13:15:12 +00:00
Victor Chang
6918dbc871 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev 
am: d3c0cf5

* commit 'd3c0cf50b6c8e71c0c409abcd3b8c32f98f7cb71':
  Api change of DPM.setApplicationRestrictionsManagingPackage()
 2016-03-21 13:12:47 +00:00
Victor Chang
d3c0cf50b6 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev 2016-03-21 13:08:14 +00:00
Polina Bondarenko
4c673bc676 Merge "Added skin temperature, thresholds to HardwarePropertiesManager" into nyc-dev am: c1d317f 
am: 1924d23

* commit '1924d238e3d55ffd04349a3d130933f5f1d667fc':
  Added skin temperature, thresholds to HardwarePropertiesManager
 2016-03-19 19:41:43 +00:00
Polina Bondarenko
1924d238e3 Merge "Added skin temperature, thresholds to HardwarePropertiesManager" into nyc-dev 
am: c1d317f

* commit 'c1d317f7141801e031abae7bd3aba1183a616230':
  Added skin temperature, thresholds to HardwarePropertiesManager
 2016-03-19 19:39:29 +00:00
Polina Bondarenko
eb84552ef0 Added skin temperature, thresholds to HardwarePropertiesManager 
Bug: 27425887
Change-Id: I13f69ae37906b71d93edbf6bea6daf809d97cfd5
 2016-03-19 10:49:18 +00:00
Ruben Brunk
cf78fb26e7 Merge "Notify VrListenerService when VR activity changes." into nyc-dev am: a46f1f7 
am: de0ebae

* commit 'de0ebae35e06abc785e4f65546b0a26ea5b93f94':
  Notify VrListenerService when VR activity changes.
 2016-03-18 23:16:12 +00:00
Ruben Brunk
de0ebae35e Merge "Notify VrListenerService when VR activity changes." into nyc-dev 
am: a46f1f7

* commit 'a46f1f7060c5212c7533cb0db3f8442f211e20eb':
  Notify VrListenerService when VR activity changes.
 2016-03-18 23:12:28 +00:00
Ruben Brunk
c7354fe2d4 Notify VrListenerService when VR activity changes. 
Bug: 27536964
Bug: 22855417

Change-Id: I67e1f8e6595332b3d768a99735bbd5fd38dffdc9
 2016-03-18 16:00:38 -07:00
Jakub Pawlowski
0554146ab9 Merge "Change how services are passed up to the stack" am: 2ebc12b am: d1ce469 
am: 4ad0a98

* commit '4ad0a983d0b3271081da4994038964486510562f':
  Change how services are passed up to the stack
 2016-03-18 22:30:47 +00:00
Jakub Pawlowski
4ad0a983d0 Merge "Change how services are passed up to the stack" am: 2ebc12b 
am: d1ce469

* commit 'd1ce469a2e2a96489d2ab3bf58c4db870e00a6e2':
  Change how services are passed up to the stack
 2016-03-18 22:28:36 +00:00
Jakub Pawlowski
c3cb898dde Update api/test-current.txt 
Change-Id: I1fa444fbe874862e6296ee6a9751c39a0cbc4b7a
 2016-03-18 15:22:31 -07:00
Julius D'souza
4110ad2ad9 Merge "CTS: Add @hide annotations to several @IntDef elements" into nyc-dev am: 77e6451 
am: 766a492

* commit '766a492f55c64faaa48f2ab504b8da14fc2708e3':
  CTS: Add @hide annotations to several @IntDef elements
 2016-03-18 20:09:50 +00:00
Jakub Pawlowski
8d312a84d6 Change how services are passed up to the stack 
Right now we pass all services, characteristics and descriptors one by one.
This patch changes that - now we pass whole GATT database at once.

Bug: 27455533
Change-Id: Ie42cd80072538e411904b9c9b011a978f26158b9
 2016-03-18 12:57:33 -07:00
Julius D'souza
77e645123f Merge "CTS: Add @hide annotations to several @IntDef elements" into nyc-dev 2016-03-18 19:53:56 +00:00
Julius D'souza
2b67c07d82 CTS: Add @hide annotations to several @IntDef elements 
Bug: 27232186

Change-Id: Idd70359e22606a5ff21dfaffd119528cedd08b5a
 2016-03-18 12:18:18 -07:00
Greg Kaiser
e1f0d9e73b Merge "ContextHubManager: Rename Callback class." into nyc-dev am: b8768ac 
am: 6c2af2f

* commit '6c2af2f298b64987d0b54cf6f5350d2d11759d80':
  ContextHubManager: Rename Callback class.
 2016-03-18 19:11:26 +00:00
Greg Kaiser
6ba60e6049 ContextHubManager: Rename Callback class. 
Since this Callback class is scoped within ContextHubManager, we
remove the redundant ContextHub from the name.  This CL is just
a rename and should not modify any behavior.

Change-Id: I40fea3ab7b5312d32a6f22b7543669ed563b9992
 2016-03-18 10:29:29 -07:00
Victor Chang
cd14c0a9da Api change of DPM.setApplicationRestrictionsManagingPackage() 
Throws NameNotFoundException instead of IllegalArgumentException

Can't throw NameNotFoundException directly from DPMS as
aidl doesn't support checked exception

Bug: 27532565
Change-Id: I202721f41057f92ad2dd851d4769ba4502a8f9b3
 2016-03-18 16:44:21 +00:00
Jeff Sharkey
70a6fd4ce4 Merge "Update direct boot related documentation." into nyc-dev am: 2a4e495 
am: a903fd7

* commit 'a903fd76262f61fa09bb5a09ad130ce8ca01ff40':
  Update direct boot related documentation.
 2016-03-18 16:37:20 +00:00
Jeff Sharkey
2a4e495448 Merge "Update direct boot related documentation." into nyc-dev 2016-03-18 16:32:16 +00:00
Phil Weaver
56b4448b65 Merge "Update a11y gesture and magnification APIs." into nyc-dev am: b2cc929 
am: 667ad17

* commit '667ad1774cf2c58c6bab258eb0bd4ac98e4d7417':
  Update a11y gesture and magnification APIs.
 2016-03-18 15:59:30 +00:00
Phil Weaver
b2cc929657 Merge "Update a11y gesture and magnification APIs." into nyc-dev 2016-03-18 15:52:29 +00:00
Przemyslaw Szczepaniak
0e5722b8ab Merge "Track libcore change (cherry picked from commit 5bad107355d440409eea313b60c40bc32c12e295)" into nyc-dev am: 438bd65 
am: e0048da

* commit 'e0048da3a9d060913bda69facfc09e14dce3d6e3':
  Track libcore change (cherry picked from commit 5bad107355d440409eea313b60c40bc32c12e295)
 2016-03-18 14:50:10 +00:00
Przemyslaw Szczepaniak
438bd65041 Merge "Track libcore change (cherry picked from commit 5bad107355d440409eea313b60c40bc32c12e295)" into nyc-dev 2016-03-18 14:43:27 +00:00
Przemyslaw Szczepaniak
4f9462669e Track libcore change (cherry picked from commit 5bad107355d440409eea313b60c40bc32c12e295) 
Bug: 27692239
Change-Id: I317bed961b861b8d1e0f8b17fc1ce2fa043baea9
 2016-03-18 14:42:05 +00:00
Alan Viverette
5a43758b84 Merge "Clean up docs, attrs, and APIs for PopupWindow enter/exit transitions" into nyc-dev am: bb09b7b 
am: 5224271

* commit '5224271f2c4f37fce92dd8d5b42ca0bc8242a30d':
  Clean up docs, attrs, and APIs for PopupWindow enter/exit transitions
 2016-03-18 14:28:43 +00:00
Alan Viverette
bb09b7bf59 Merge "Clean up docs, attrs, and APIs for PopupWindow enter/exit transitions" into nyc-dev 2016-03-18 14:18:28 +00:00
Przemyslaw Szczepaniak
7e446b5f2f Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde 
Bug: 27692239
Change-Id: I43fee87bed4744c36660b28a03915ecd5dfce272
 2016-03-18 13:58:43 +00:00
Alan Viverette
1e940dc2d1 Clean up docs, attrs, and APIs for PopupWindow enter/exit transitions 
Bug: 27654124
Change-Id: I9a323eeea464b4b9ca6111ef47192fdbcc5bca24
 2016-03-18 09:55:10 -04:00
Przemyslaw Szczepaniak
0d094343f6 Track libcore change ff18b5f136f92154f2e05217e3953d10f459e561 am: 2c83702 
am: b085bc6

* commit 'b085bc6d914d5fa17984ee4d75007a8478d8d512':
  Track libcore change ff18b5f136f92154f2e05217e3953d10f459e561
 2016-03-18 12:54:06 +00:00
Przemyslaw Szczepaniak
2c83702aa2 Track libcore change ff18b5f136f92154f2e05217e3953d10f459e561 
Bug: 27692239
Change-Id: I2f8e436452d707bb9739a5d89fe1002442ac230d
 2016-03-18 12:46:05 +00:00
Przemyslaw Szczepaniak
50238ae4b4 Merge "Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c" 2016-03-18 12:44:30 +00:00
Gustav Sennton
0841ae58e5 Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev am: eedcdb0 
am: 6e06848

* commit '6e068483f22e93da06894de3d79bd5033d4e4d79':
  Remove WebView-package-being-replaced logic from WebViewUpdateService.
 2016-03-18 11:00:10 +00:00
Gustav Sennton
eedcdb0452 Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev 2016-03-18 10:52:34 +00:00
Jeff Sharkey
cf3f0a11a8 Update direct boot related documentation. 
Also hide a few APIs as requested by council.  Add a method to
easily determine if a given File would already be encrypted at rest
by the OS.

Bug: 27531029
Change-Id: Icad5f1cd56411ad3ac707db85fd7449acdcc4b94
 2016-03-17 19:58:05 -06:00
Phil Weaver
1977da4488 Merge "Treat accessibility actions as user activity" into nyc-dev am: 6fdd3af 
am: 5d9c243

* commit '5d9c2436f22008937e2829c34aa35103abbafcdd':
  Treat accessibility actions as user activity
 2016-03-17 22:27:26 +00:00
Phil Weaver
6fdd3afdcc Merge "Treat accessibility actions as user activity" into nyc-dev 2016-03-17 22:19:17 +00:00
Dongwon Kang
c694e22533 Merge "TIF: Remove TvInputManager.Session from system API" into nyc-dev am: 62b5ec7 
am: 1a242b5

* commit '1a242b5024eda73fd00c4e279f2145804a0b0948':
  TIF: Remove TvInputManager.Session from system API
 2016-03-17 22:09:49 +00:00
Jeff Sharkey
78bcc89df4 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev am: a0a58a2 
am: 5a128c4

* commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d':
  Refactoring FBE APIs based on council feedback.
 2016-03-17 22:09:46 +00:00