Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,483 Commits 3 Branches 0 Tags
1cf689b0fdcd3c849efbc02cd5dd3a445e773b83
Commit Graph

13133 Commits

Author SHA1 Message Date
Peng Xu
7366923927 Merge "[Sensor] Add a constant to match native header" 2016-03-23 17:50:24 +00:00
Abodunrinwa Toki
8c8d552b4e Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev am: ae64758 
am: f99cbc8

* commit 'f99cbc87358ac19b0a9a74e7763eff67455e44f7':
  Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
 2016-03-23 16:14:46 +00:00
Abodunrinwa Toki
ae64758edd Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev 2016-03-23 16:02:36 +00:00
Abodunrinwa Toki
07177140e4 Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS 
Bug: 26943892
Change-Id: I1eb6bd7a9e816190b96dc1516d5874eb966385a4
 2016-03-22 17:12:22 +00:00
Joachim Sauer
d64dce94a6 Merge "Hide general utility methods in ICU4J." into nyc-dev am: 3c3a59e 
am: 6b6c7fd

* commit '6b6c7fdf650d986b89ef6a353c0b0f119bf68b3d':
  Hide general utility methods in ICU4J.
 2016-03-22 16:41:41 +00:00
Joachim Sauer
d76fe896d4 Hide general utility methods in ICU4J. 
Bug: 22023363
Change-Id: I1d1624b4846fba7855fa7273fa34646c85369b56
 2016-03-22 16:07:26 +00:00
Paul Duffin
57b265f4d6 Merge "ICU4J: Removed a couple of useless or internal methods from API" into nyc-dev am: 83ad1c1 
am: 62b7758

* commit '62b7758d44664ada495f38b078a925f44fefd33e':
  ICU4J: Removed a couple of useless or internal methods from API
 2016-03-22 16:07:24 +00:00
Paul Duffin
48f76cdf83 Merge "ICU4J: Update API for using civil version of IslamicCalendar" into nyc-dev am: d7ec6e5 
am: e591be8

* commit 'e591be86372799ce1ded21daa92f150e067143ee':
  ICU4J: Update API for using civil version of IslamicCalendar
 2016-03-22 16:01:45 +00:00
Paul Duffin
c108dea0bb ICU4J: Removed a couple of useless or internal methods from API 
Bug: 22023363
Change-Id: Iaa0b4335ad50bbad2ad87ab5b70834a602f50422
 2016-03-22 15:55:01 +00:00
Paul Duffin
d7ec6e5a8e Merge "ICU4J: Update API for using civil version of IslamicCalendar" into nyc-dev 2016-03-22 15:53:50 +00:00
Tony Mak
fe5cd89cb9 Revert getUserInfo change and add isManagedPorfile(int userId) am: 8673b28 
am: 438b3f2

* commit '438b3f218dbf3e0fe33676afe5e1e4fcfd4f2dcc':
  Revert getUserInfo change and add isManagedPorfile(int userId)
 2016-03-22 15:32:58 +00:00
Tony Mak
8673b2899e Revert getUserInfo change and add isManagedPorfile(int userId) 
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
 2016-03-22 15:26:05 +00:00
Paul Duffin
74a8e08d59 ICU4J: Update API for using civil version of IslamicCalendar 
Bug: 22023363
Change-Id: I1a3d25be65f9f69767cc32df1b768700e30463cf
 2016-03-22 13:46:38 +00:00
Jakub Pawlowski
390dced18a Update api/test-current.txt 
Change-Id: I1fa444fbe874862e6296ee6a9751c39a0cbc4b7a
 2016-03-21 20:34:05 -07:00
Jakub Pawlowski
bf0faed359 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-21 19:58:27 -07:00
Christopher Tate
f8d09be47e Merge "Add API to read the current wallpaper\'s ID" into nyc-dev am: c823df1 
am: 924f6d8

* commit '924f6d87da6ebb75d03760becc99306a1daf5533':
  Add API to read the current wallpaper's ID
 2016-03-22 00:10:02 +00:00
Christopher Tate
924f6d87da Merge "Add API to read the current wallpaper\'s ID" into nyc-dev 
am: c823df1

* commit 'c823df1435b6e660a2ed2f345a28b1f391378f0f':
  Add API to read the current wallpaper's ID
 2016-03-22 00:07:23 +00:00
Christopher Tate
e409f0e462 Add API to read the current wallpaper's ID 
Also regularize cross-user call handling throughout.

Bug 27743435

Change-Id: Ibc530d0576d657723a613888357a6ea71b482763
 2016-03-21 15:32:57 -07:00
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