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

64739 Commits

Author SHA1 Message Date
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
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
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
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
554fa0fa90 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 2016-04-18 16:51:56 +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
Tony Mak
4dc4d3ed0f Show work challenge in if user in docked stack is locked 
am: 853304c

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

Change-Id: I1a5ff10237639fa2f0c20c756594d1d04c16d07d
 2016-04-18 15:40:43 +00:00
Tony Mak
853304c0b1 Show work challenge in if user in docked stack is locked 
Register docked stack listener in ActivityManagerService.
If the docked stack is leaving minimized state, check whether the user
of the docked stack is locked. If yes, show credential confirmation.
Also, we now show work challenge in home task.

And we now scan the entire top task to handle the case the work app is
somewhere in the middle of the task. (eg: open personal camera in work app)

Bug: 27565539
Bug: 28094505

Change-Id: Iaf0738f43ae916a535b17949ec0f322bbfb194dc
 2016-04-18 15:35:36 +00:00
Calin Juravle
d44baa11a0 Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev am: 6aff67b am: f139143c 
am: b8d5524

* commit 'b8d5524d8d7211b266e5405da7864c7f9eefae20':
  Register the UI Thread as a sensitive thread to the runtime

Change-Id: I22fca39e19f94f1fdc560e19ad27f78e5abdeca9
 2016-04-18 11:00:55 +00:00
Calin Juravle
f139143ccc Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev 
am: 6aff67b

* commit '6aff67bfcb9dcca6e3f26ff04dbe8f9806e5e8a5':
  Register the UI Thread as a sensitive thread to the runtime

Change-Id: Ib3e5d6ac34f14c6d6f0809d2f969422b49efea8f
 2016-04-18 10:51:07 +00:00
Narayan Kamath
75d09e6608 Remove unnecessary allocation+unboxing of objects. am: a09b4d2 am: 4c89ae0 
am: 42c2de5

* commit '42c2de56abb91a613291a935cc88da3f655b3a9d':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Ic48935549f7f9b13d5f0a2d98fc0979fbfc5a38b
 2016-04-18 10:42:28 +00:00
Calin Juravle
6aff67bfcb Merge "Register the UI Thread as a sensitive thread to the runtime" into nyc-dev 2016-04-18 10:40:31 +00:00
Narayan Kamath
42c2de56ab Remove unnecessary allocation+unboxing of objects. am: a09b4d2 
am: 4c89ae0

* commit '4c89ae0ee4f3d73d84843bf05cdc328b5e821da3':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: I46f5ec0b9b8bc14073bcf7dc643bc909072d53ff
 2016-04-18 10:36:37 +00:00
Narayan Kamath
3a00b69702 Remove unnecessary allocation+unboxing of objects. 
am: a09b4d2

* commit 'a09b4d2a611a7606e8fc8c73a24bd941b6fc173f':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
 2016-04-18 10:31:37 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects. 
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
 2016-04-18 09:55:59 +01:00
Wale Ogunwale
3cce9525aa Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev am: 02ebaa0 am: 188b013 
am: bba910f

* commit 'bba910f8a245614949f43565a6ba2ee01dabe752':
  Don't allow pinned activities to request visible behind

Change-Id: Ie3389a2354325045cc465513d7466d359e93d464
 2016-04-18 04:38:46 +00:00
Wale Ogunwale
188b0139aa Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev 
am: 02ebaa0

* commit '02ebaa02c41050b7223b9ec772da669810bff43b':
  Don't allow pinned activities to request visible behind

Change-Id: I78704c8b677f91b268d83da971b3f50bd479b6ba
 2016-04-18 04:29:22 +00:00
Hugo Benichi
e78f7544fd Merge "Make android.net.metrics Event classes @SystemApi am: 4b6dfc2 am: 9cae985" into nyc-mr1-dev-plus-aosp 
am: ab317e3

* commit 'ab317e363f35e75cb64175707e6a4f058d95321e':
  Make android.net.metrics Event classes @SystemApi

Change-Id: Iaa17df5b1c40f399be22133ecddb3a2440023329
 2016-04-18 04:25:20 +00:00
Hugo Benichi
4cc6157ec6 Merge "Fixes fatal linter errors in android.net.metrics am: 627b424 am: 4acf772" into nyc-mr1-dev-plus-aosp 
am: 99e19f0

* commit '99e19f05f3db1de280e1647c52ddb96a93beb2c1':
  Fixes fatal linter errors in android.net.metrics

Change-Id: I258c7b4f163f60d38ac86985b6b6cdf8dc92199e
 2016-04-18 04:25:15 +00:00
Hugo Benichi
d06bcb897c Fix spurious DHCP parse error logging. am: 2677b19 am: 2fd113f 
am: 41be6c6

* commit '41be6c6e29dd171508fdd932fcd7e38185253b2f':
  Fix spurious DHCP parse error logging.

Change-Id: I341b0067062ca83baa0b14a5eaba6ac863b51006
 2016-04-18 04:25:02 +00:00
Hugo Benichi
c186a329ff Make android.net.metrics Event classes @SystemApi am: 4b6dfc2 
am: 9cae985

* commit '9cae985dde8471e8e86b8edcf335ac6af2ab1c78':
  Make android.net.metrics Event classes @SystemApi

Change-Id: I8bada03f66458e95e25b02bdc49aaa1717c609cd
 2016-04-18 04:20:12 +00:00
Hugo Benichi
22c7826778 Fixes fatal linter errors in android.net.metrics am: 627b424 
am: 4acf772

* commit '4acf772eeba55a6fb0235df59cc22aa36bdf72d3':
  Fixes fatal linter errors in android.net.metrics

Change-Id: Ib7d9148cadc5879f895887f91eb6793c0a059832
 2016-04-18 04:20:10 +00:00
Hugo Benichi
41be6c6e29 Fix spurious DHCP parse error logging. am: 2677b19 
am: 2fd113f

* commit '2fd113fbfec42ba0313a217de4766cddde683d91':
  Fix spurious DHCP parse error logging.

Change-Id: I9b328bb9cdd45ec6a067ca335033e1ae9f8bbf58
 2016-04-18 04:20:07 +00:00
TreeHugger Robot
02ebaa02c4 Merge "Don't allow pinned activities to request visible behind" into nyc-dev 2016-04-18 04:19:36 +00:00
Hugo Benichi
3a869886de Make android.net.metrics Event classes @SystemApi 
am: 4b6dfc2

* commit '4b6dfc2ef54723768a67887ce2a42d4f8f64d0f4':
  Make android.net.metrics Event classes @SystemApi

Change-Id: I1a7dd85cb06027ce13ae90f04679608c6f536e37
 2016-04-18 04:15:17 +00:00
Hugo Benichi
d2d7609a99 Fixes fatal linter errors in android.net.metrics 
am: 627b424

* commit '627b42494d82eca4fd51abfc0a5d7f330862b881':
  Fixes fatal linter errors in android.net.metrics

Change-Id: Icf26ffa76b73f4782e548c680c39ccc0d7661f26
 2016-04-18 04:15:14 +00:00
Hugo Benichi
09979b4325 Fix spurious DHCP parse error logging. 
am: 2677b19

* commit '2677b1957b444e2dae5737feee989109b811547c':
  Fix spurious DHCP parse error logging.

Change-Id: I5e3893d101c9e0d49270357ba6978bf58e3d9c52
 2016-04-18 04:15:12 +00:00
Hugo Benichi
4b6dfc2ef5 Make android.net.metrics Event classes @SystemApi 
Bug: 28204408
Change-Id: I8ffe833213bbc03a7f70c51789f4899ee08f6e08
 2016-04-18 11:36:42 +09:00
Hugo Benichi
627b42494d Fixes fatal linter errors in android.net.metrics 
This patch changes how Event classes are organized:
 - Base IpConnectivityEvent class does not implement Parcelable because
   it cannot be final (has children). It also becomes abstract because
   it is not supposed to be instantiated and logged directly.
 - All children classes becomes final because they are Parcelable.
 - All constructors of all children classes become private, because they
   are supposed to be instantiated with their associated logEvent()
   methods.
 - All instance fields of all children classes become public final.
      Rational: if private, the ConnectivityMetrics app cannot read
      their data.

Bug: 28204408
Change-Id: I1a4689c422230c6ed034307dec54a61daf8a6598
 2016-04-18 11:29:03 +09:00
Hugo Benichi
2677b1957b Fix spurious DHCP parse error logging. 
This patch moves the event logging of DHCP response packet parse errors
to DHCPClient in a single place. It also logs receive IO errors as
DHCPErrors instead of DHCPClientEvents.

BUG=28197345

Change-Id: I7ad666cff4d8b97915880477347fbb3f588fdb2a
 2016-04-18 11:27:35 +09:00
Wale Ogunwale
43896cffe6 Don't allow pinned activities to request visible behind 
Also, release visible behind when pinning a visible behind activity.

Bug: 28042883
Change-Id: I1162d7639626f669f648ff82f5c367cb7b3fe6e6
 2016-04-16 10:54:30 -07:00
Makoto Onuki
36f4afbcca Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev am: e2be9f4 
am: 2870094

* commit '2870094a86531e977898681aef503bb393b24a3e':
  ShortcutManager: Categories should be Set, not List.

Change-Id: I114c3ac304bed3b237128c2e330dec0fe19f6613
 2016-04-16 15:28:06 +00:00
Makoto Onuki
2870094a86 Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev 
am: e2be9f4

* commit 'e2be9f4a670198edbe9b1c42422d6d429b8a21f6':
  ShortcutManager: Categories should be Set, not List.

Change-Id: Icd32225f6a2e05cc4157343d2ab9adb16d1c6348
 2016-04-16 15:24:57 +00:00
Makoto Onuki
e2be9f4a67 Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev 2016-04-16 15:18:39 +00:00
Amith Yamasani
d9af2fcd34 Merge "Address API review for UserManager user creation" into nyc-dev am: 25c66ac 
am: 6797d86

* commit '6797d86d76ee193bc20809f118163a86eaf28b4b':
  Address API review for UserManager user creation

Change-Id: Ibfc33fcf16d958272b7dc6cad59e5ee557716706
 2016-04-16 00:24:51 +00:00
Amith Yamasani
6797d86d76 Merge "Address API review for UserManager user creation" into nyc-dev 
am: 25c66ac

* commit '25c66ac8e66f67aeb100bd808ff52a2cda0294fb':
  Address API review for UserManager user creation

Change-Id: I40f9c392abc8fc1b5303fd09be93c49ab675e1b4
 2016-04-16 00:22:16 +00:00
Amith Yamasani
25c66ac8e6 Merge "Address API review for UserManager user creation" into nyc-dev 2016-04-16 00:18:22 +00:00
Makoto Onuki
be73a8068f ShortcutManager: Categories should be Set, not List. 
Bug 27923857

Change-Id: Ife859da8e66478174f6c4463316886a23e5aa4e0
 2016-04-15 17:15:29 -07:00
Chien-Yu Chen
79291b09a5 Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev am: dfe920d 
am: 767d366

* commit '767d3668422ad00d239853ab6ca68dfc790ffe42':
  Camera2: Stop repeating request for abandoned output

Change-Id: I61b623a9eaf9772fc2a562b822a145513f8c4149
 2016-04-15 23:47:22 +00:00
Chien-Yu Chen
767d366842 Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev 
am: dfe920d

* commit 'dfe920d3bb3a1b896d3b16d1b58bd7d56fc2e70d':
  Camera2: Stop repeating request for abandoned output

Change-Id: I9c5e31e5476e860d7b1ac974d62ae6fb5646069a
 2016-04-15 23:44:33 +00:00
Chien-Yu Chen
dfe920d3bb Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev 2016-04-15 23:38:14 +00:00
Aurimas Liutikas
e38f2e2cfd Merge "Increase SearchView touch targets to meet GAR3." into nyc-dev am: d0612e7 
am: fd72016

* commit 'fd72016a1c8e05fbd7b1e8b8130daefb5db43cb1':
  Increase SearchView touch targets to meet GAR3.

Change-Id: Ife4789e2da784d60fb81fcbfc963573b79922da4
 2016-04-15 23:20:28 +00:00
Aurimas Liutikas
fd72016a1c Merge "Increase SearchView touch targets to meet GAR3." into nyc-dev 
am: d0612e7

* commit 'd0612e74f27844904af55ddb133522cec4298058':
  Increase SearchView touch targets to meet GAR3.

Change-Id: I355146f0ada66b3cc6e029193cc1d3e015162a0b
 2016-04-15 23:16:31 +00:00
Chien-Yu Chen
2da496f1ce Camera2: Stop repeating request for abandoned output 
Stop repeating request if any of its output stream is abandoned
and notify that repeating request has been stopped.

Update binder tests for binder interface changes.

Update CameraDeviceImpl to expect an exception when canceling
a repeating request that is already stopped.

Bug: 21270879
Change-Id: I9fa72ae7218948aac88cb1a8e57839bd022c4a5e
 2016-04-15 16:04:18 -07:00
Aurimas Liutikas
d0612e74f2 Merge "Increase SearchView touch targets to meet GAR3." into nyc-dev 2016-04-15 22:47:11 +00:00
John Reck
fb25fd47fa Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev am: 736a525 
am: 8fdfaf3

* commit '8fdfaf381257c330d4c919ce5edd0564c89d9313':
  Fix sw legacy compat path in SurfaceView

Change-Id: I5c4c9d2194da8987c7a9612448433d8bf83cf3d0
 2016-04-15 22:39:34 +00:00
John Reck
8fdfaf3812 Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev 
am: 736a525

* commit '736a52538a9072a96dab02c14c89bb2e0a92c645':
  Fix sw legacy compat path in SurfaceView

Change-Id: I6d5961535ce22cf699478e28dd1b6c3e0d6e1379
 2016-04-15 22:34:17 +00:00
John Reck
736a52538a Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev 2016-04-15 22:22:41 +00:00
Adam Powell
f4cfbeda87 Merge "Retain loaders through stopped config changes" into nyc-dev am: e33901c 
am: c108628

* commit 'c108628d33610975dd13564bf7750dff5eebaeaf':
  Retain loaders through stopped config changes

Change-Id: Ib63609d91efae1549c61b4f5fb8f2a1b24fe7ece
 2016-04-15 21:52:14 +00:00