Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
248,175 Commits 3 Branches 0 Tags
f861c77458e5ca7c944e0b8ea218778b76223b45
Commit Graph

248175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
f861c77458 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev am: bfa6d23 am: 33de442 
am: c0b10c2

* commit 'c0b10c2515f289495f854c045cdfca9e129ef2a0':
  MediaBrowserService: Provide a way to retrieve root hints

Change-Id: Ieca1f45e3f46a4719f9b7993fd1fe7a36b98dba5
 2016-04-18 17:42:24 +00:00
Sungsoo Lim
c0b10c2515 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev am: bfa6d23 
am: 33de442

* commit '33de4426e907538a466e893044a6b398711dee0b':
  MediaBrowserService: Provide a way to retrieve root hints

Change-Id: Ic673df4e808d14fde986602e1d1e1e7b169f7dd7
 2016-04-18 17:36:47 +00:00
Craig Donner
9a8de997e0 Merge "Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 am: c25b1e1" into nyc-mr1-dev-plus-aosp 
am: fdd1f38

* commit 'fdd1f384dfc160a207b08168bfeb09d4ee39096c':

Change-Id: I666c9c7b4c02977142d8faacfee4d74739d031a2
 2016-04-18 17:31:50 +00:00
Craig Donner
b9ff7f725e Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 am: 5a92375 
am: de15a3b

* commit 'de15a3b3d485948af3d8cda30c2844f7a141e401':
  Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE

Change-Id: Iaece123a511ae0a164316981a7e421cd7bcdc8af
 2016-04-18 17:31:47 +00:00
Sungsoo Lim
33de4426e9 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev 
am: bfa6d23

* commit 'bfa6d239b578fabd34781c11711a5413322efa6c':
  MediaBrowserService: Provide a way to retrieve root hints

Change-Id: I632db5f48f65b189b0e21f858a7b091bb06ea102
 2016-04-18 17:31:27 +00:00
Android Build Merger (Role)
fdd1f384df Merge "Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 am: c25b1e1" into nyc-mr1-dev-plus-aosp 2016-04-18 17:26:57 +00:00
Craig Donner
120d35cf45 Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 
am: c25b1e1

* commit 'c25b1e1535ae3ae9eb1a5568004e801d18d05df8':
  Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE

Change-Id: I7292e66255e733e0da906b14c0a0096bc518ea95
 2016-04-18 17:26:33 +00:00
Craig Donner
de15a3b3d4 Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev am: e54b439 
am: 5a92375

* commit '5a9237586f312b94d666a4bd8e5471e6e9080761':
  Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE

Change-Id: Ibcea8ec84d7a93187e96237adce6b72c2c2d2371
 2016-04-18 17:26:21 +00:00
Sungsoo Lim
bfa6d239b5 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev 2016-04-18 17:21:59 +00:00
Craig Donner
c25b1e1535 Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev 
am: e54b439

* commit 'e54b4397d37e12daa4d068feb61f9532afa6930e':
  Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE

Change-Id: Iecadd045dbd233522f2b1382c28eb7bdfb547ac6
 2016-04-18 17:21:09 +00:00
Craig Donner
5a9237586f Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev 
am: e54b439

* commit 'e54b4397d37e12daa4d068feb61f9532afa6930e':
  Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE

Change-Id: I0e10b1bc2eab517f2f3da2a0f43ac82eb893c9fb
 2016-04-18 17:21:08 +00:00
Dan Stoza
74277417e4 Merge "Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f am: 379aabd" into nyc-mr1-dev-plus-aosp 
am: d306436

* commit 'd306436ece7eb95e8357a5412e16a6a5ba07f024':

Change-Id: Ib6c511fb5e44226bce60da3bfda35f323902becb
 2016-04-18 17:10:32 +00:00
Dan Stoza
01f70a29d9 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f am: 18120cd 
am: 6b35f57

* commit '6b35f571af17ea4176b812a53ec5069347491887':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Ia283c09c14f4cdbc4b59b7dbcc5df8bc1116eaf0
 2016-04-18 17:10:28 +00:00
Craig Donner
e54b4397d3 Merge "Replace CTS with CDD in comment for FEATURE_VR_MODE_HIGH_PERFORMANCE" into nyc-dev 2016-04-18 17:09:55 +00:00
Android Build Merger (Role)
d306436ece Merge "Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f am: 379aabd" into nyc-mr1-dev-plus-aosp 2016-04-18 17:05:43 +00:00
Dan Stoza
6b35f571af Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f 
am: 18120cd

* commit '18120cd472b7814bb3e7e468114f5be561bc0412':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Iec5ef8db6169a1c0097faffbb20782a57dfe392f
 2016-04-18 17:05:19 +00:00
Dan Stoza
53379b8cea Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f 
am: 379aabd

* commit '379aabd81e1eedcebcc24007c0274f8e6c00d211':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: I3fdd51c53b0aa6edb13a77238759a272dc067c16
 2016-04-18 17:05:16 +00:00
Dan Stoza
379aabd81e Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 
am: 554fa0f

* commit '554fa0fa90f1d7eb2b7111c7d93ab3303b4ccdd8':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: I832cfabe3a3fc9a3a5ffaaab1a5cb82bf94cce24
 2016-04-18 17:00:03 +00:00
Dan Stoza
18120cd472 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 
am: 554fa0f

* commit '554fa0fa90f1d7eb2b7111c7d93ab3303b4ccdd8':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: Idf767a504af9c3dc1244ecb2f9b9101cfe6b907c
 2016-04-18 17:00:02 +00:00
Gustav Sennton
29aa1546cd Merge "Add unit tests verifying the webview package versioncode validation" 2016-04-18 16:59:34 +00:00
Dan Stoza
554fa0fa90 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 2016-04-18 16:51:56 +00:00
Shishir Agrawal
b04536bc56 Merge "Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev am: 3f6e211 am: 6a308f1" into nyc-mr1-dev-plus-aosp 
am: 7f08dcd

* commit '7f08dcd927e40cdca9306d3517e8fb3115bd6ef2':

Change-Id: I70b944226d4c951144a0e02517a4cf63069ffb0d
 2016-04-18 16:44:51 +00:00
Robert Greenwalt
61a6475d08 Merge "Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev am: 951fe29 am: eb70a28" into nyc-mr1-dev-plus-aosp 
am: 3867303

* commit '3867303ef54367bafe0cdf864e72ac52753c84fd':

Change-Id: I6222e186b02e9c7fc8153d1ddceed48439836542
 2016-04-18 16:44:48 +00:00
Robert Greenwalt
32b77f04a5 Merge "Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4 am: 9297971" into nyc-mr1-dev-plus-aosp 
am: 4470010

* commit '4470010de00bacd37d1ebba9b53e8256c7867f9d':

Change-Id: Iec0f7335b60ab5060ea01a31d15127101e29e5ed
 2016-04-18 16:44:44 +00:00
Shishir Agrawal
731a56bd31 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev am: 3f6e211 am: 54cf95f 
am: 7cf4dd6

* commit '7cf4dd63ee6b97b0c7e1fff16f792c7a8e64146c':
  Adding slotId to certain Telephony broadcasts.

Change-Id: I86a4d88dfa07e68449188da6fe86351289a72417
 2016-04-18 16:44:38 +00:00
Sunil Dutt
f0bdcb4610 Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev am: 951fe29 am: 7299ce9 
am: 60f0078

* commit '60f0078dc254e78824095106cada08b5eabac600':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I810db6a7694445696f5d431f51064ee14a5b5e04
 2016-04-18 16:44:29 +00:00
Sandeep Gutta
fbbefaa278 Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4 am: b6eb7fa 
am: df4d50c

* commit 'df4d50c0aeed3482fcc06d220d3cb36f955088ed':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I989bb28f3e70559692d02e78d271a937d8884c43
 2016-04-18 16:44:20 +00:00
Android Build Merger (Role)
7f08dcd927 Merge "Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev am: 3f6e211 am: 6a308f1" into nyc-mr1-dev-plus-aosp 2016-04-18 16:40:06 +00:00
Android Build Merger (Role)
3867303ef5 Merge "Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev am: 951fe29 am: eb70a28" into nyc-mr1-dev-plus-aosp 2016-04-18 16:39:53 +00:00
Android Build Merger (Role)
4470010de0 Merge "Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4 am: 9297971" into nyc-mr1-dev-plus-aosp 2016-04-18 16:39:40 +00:00
Shishir Agrawal
e74610d1d3 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev am: 3f6e211 
am: 6a308f1

* commit '6a308f1f8271fbec7c58a2aa32eea93f02d2cb34':
  Adding slotId to certain Telephony broadcasts.

Change-Id: Iafd013bbd8e64547ca55f2722f9ab1a7dc4cd14c
 2016-04-18 16:38:58 +00:00
Robert Greenwalt
3fb2525245 Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev am: 951fe29 
am: eb70a28

* commit 'eb70a28f62b300be4002fb794a8b169cec9df2a9':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I1af84d94779afd8ac2ca11de2cc19194a8d89537
 2016-04-18 16:38:55 +00:00
Shishir Agrawal
7cf4dd63ee Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev am: 3f6e211 
am: 54cf95f

* commit '54cf95f618301ed443819b73b4c292a199d95d95':
  Adding slotId to certain Telephony broadcasts.

Change-Id: I75612fbfe4bcd5a4c3d6f9f9073de6d05f8ce80d
 2016-04-18 16:38:53 +00:00
Robert Greenwalt
60f0078dc2 Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev am: 951fe29 
am: 7299ce9

* commit '7299ce924f8c0cc166af74429766c204001f5d5f':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I23779849aa8bbe7627c546e8f3895d065ece83a3
 2016-04-18 16:38:51 +00:00
Robert Greenwalt
4bc72005ed Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4 
am: 9297971

* commit '92979713906907c85b557532ec54199c584aa32e':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: Ia8ec0225283a7c41fe8e91ee087b6ccd3bab8dee
 2016-04-18 16:38:50 +00:00
Robert Greenwalt
df4d50c0ae Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4 
am: b6eb7fa

* commit 'b6eb7fabbd3aa6c55ea191e7cd6518fe30e8106a':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I4432e950c823405329b42a7f7ad51739bff970e8
 2016-04-18 16:38:48 +00:00
Shishir Agrawal
54cf95f618 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev 
am: 3f6e211

* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
  Adding slotId to certain Telephony broadcasts.

Change-Id: If4b3ca0500b43137bd33d22449fb362bdf30c1d1
 2016-04-18 16:33:08 +00:00
Sunil Dutt
7299ce924f Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev 
am: 951fe29

* commit '951fe2925ff61b7d11149c3d897763d278ba1006':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I7ebe1f138d53cf683afab573588bf67597fe10bd
 2016-04-18 16:33:05 +00:00
Shishir Agrawal
6a308f1f82 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev 
am: 3f6e211

* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
  Adding slotId to certain Telephony broadcasts.

Change-Id: Ie7ba6572548e7951d3c864e241b49aa38d656dd3
 2016-04-18 16:33:02 +00:00
Sandeep Gutta
b6eb7fabbd Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev 
am: 37c26e4

* commit '37c26e4d13235b9fd297f1d52e9d874b7e488fbf':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I5d7cbd11c5739c96b3d316ebf51e9424fbe703bf
 2016-04-18 16:33:02 +00:00
Sunil Dutt
eb70a28f62 Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev 
am: 951fe29

* commit '951fe2925ff61b7d11149c3d897763d278ba1006':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: Ide2ad48f7372b1cb017040f299af79f67d67ec30
 2016-04-18 16:33:00 +00:00
Sandeep Gutta
9297971390 Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev 
am: 37c26e4

* commit '37c26e4d13235b9fd297f1d52e9d874b7e488fbf':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I66abed6e3719160f8e9a80dba4802a0435dc4012
 2016-04-18 16:32:58 +00:00
Shishir Agrawal
3f6e211d73 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev 2016-04-18 16:28:16 +00:00
Robert Greenwalt
951fe2925f Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev 2016-04-18 16:27:52 +00:00
Robert Greenwalt
37c26e4d13 Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev 2016-04-18 16:25:04 +00:00
Tony Mak
020578de16 Merge "Show work challenge in if user in docked stack is locked am: 853304c am: d9db7c7" into nyc-mr1-dev-plus-aosp 
am: a2368e3

* commit 'a2368e304f8858d1725b34731caadcced6d78c2e':

Change-Id: I77f8905ba2cb8899e3b3dc0b269f8281cb4b223f
 2016-04-18 15:50:58 +00:00
Tony Mak
59afde8c57 Show work challenge in if user in docked stack is locked am: 853304c am: 4dc4d3e 
am: 771f2f4

* commit '771f2f457eb10b0bf0641bf3c12d6d5e6d38eb55':
  Show work challenge in if user in docked stack is locked

Change-Id: Ic8992dacbc4c550250abe7ace79854d900d25def
 2016-04-18 15:50:54 +00:00
Android Build Merger (Role)
a2368e304f Merge "Show work challenge in if user in docked stack is locked am: 853304c am: d9db7c7" into nyc-mr1-dev-plus-aosp 2016-04-18 15:46:12 +00:00
Tony Mak
5638b7af01 Show work challenge in if user in docked stack is locked am: 853304c 
am: d9db7c7

* commit 'd9db7c76a69f40e3a5235844d0f7bfd50a17bd86':
  Show work challenge in if user in docked stack is locked

Change-Id: I26990a3c9ebdbf1eacbb2bce95aea256c3f7e6d4
 2016-04-18 15:45:46 +00:00
Tony Mak
771f2f457e Show work challenge in if user in docked stack is locked am: 853304c 
am: 4dc4d3e

* commit '4dc4d3ed0f250576a92966a44b2e11cde9407041':
  Show work challenge in if user in docked stack is locked

Change-Id: I0accaaea60e5db405f1fe697213ebcc545245dfd
 2016-04-18 15:45:41 +00:00