Commit Graph

58112 Commits

Author SHA1 Message Date
John Reck
18fd148170 Merge "Fix NPE checkjni" into nyc-dev
am: 2a12c6c

* commit '2a12c6c2cf87be85365025c8a71976cc9117e2f6':
  Fix NPE checkjni

Change-Id: I34f969987f14159d3a3f5c1bb0d09774bf001845
2016-04-18 17:58:12 +00:00
John Reck
2a12c6c2cf Merge "Fix NPE checkjni" into nyc-dev 2016-04-18 17:48:01 +00:00
Dan Stoza
c33adb5acf Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev
am: 71574c3

* commit '71574c3371441b621700e2829f28e0e6eeec1bd4':
  Revert "Hook up HDR capabilities from native SurfaceControl"

Change-Id: I433d0eacc1b3114af7ad4c1fa8baffee66a3f5c9
2016-04-18 17:47:35 +00:00
Dan Stoza
71574c3371 Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev 2016-04-18 17:37:57 +00:00
Dan Stoza
2c38f45f27 Revert "Hook up HDR capabilities from native SurfaceControl"
This reverts commit 49d438ebdf.

Change-Id: Ic41e3006f06784a9fe6adaba6445bb18f2e7fad1
2016-04-18 17:35:38 +00:00
John Reck
4afbed15f3 Fix NPE checkjni
Fixes: 28240259

releasedCallback can be null, which we need to check for

Change-Id: Ib218e1c624be8734db5722fc625ebbd72fa099ec
2016-04-18 10:35:08 -07: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
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
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
554fa0fa90 Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev 2016-04-18 16:51:56 +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
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
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
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
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
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
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
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
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
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
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
c108628d33 Merge "Retain loaders through stopped config changes" into nyc-dev
am: e33901c

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

Change-Id: Iefbafb4774933dde3acaee36f50f364fe0b3af76
2016-04-15 21:49:01 +00:00
Adam Powell
e33901c232 Merge "Retain loaders through stopped config changes" into nyc-dev 2016-04-15 21:40:53 +00:00
Svetoslav Ganov
7deea71671 Merge "Properly notify magnification listener" into nyc-dev
am: 286c5b7

* commit '286c5b7741dc7632e28f352a4be9bc79dde2d177':
  Properly notify magnification listener

Change-Id: I072355926cec46b71f62ece522d199672ce12d37
2016-04-15 21:39:34 +00:00
Svetoslav Ganov
286c5b7741 Merge "Properly notify magnification listener" into nyc-dev 2016-04-15 21:32:05 +00:00
Svetoslav Ganov
7d477d4845 Properly notify magnification listener
bug:28088856

Change-Id: Iffd848082f035319aab3af177921bb3085844ab0
2016-04-15 14:30:47 -07:00
Amith Yamasani
0696434c62 Address API review for UserManager user creation
Don't return null from createUserCreationIntent()
Provide a way for apps to query if the device
supports multiple users.

Some additional documentation for UserManager class to
make things clear about the types of users and relationship
with accounts.

Change-Id: I768d816e73a1d7f61cdc415f9e482adc79e2715a
Fixes: 28150359
2016-04-15 14:10:02 -07:00
Aurimas Liutikas
c8fd00a046 Increase SearchView touch targets to meet GAR3.
- Allow SearchView to expand to 48dp height if possible.
- Make the search clear button have 48dp height if possible.
- Expand the search TextView touch target height to 48dp is possible.

Framework version of patch ag/912646

Bug: 19479861
Change-Id: Ibaaef2afa20b8c05eaac8f028df4f616f2f96eb1
2016-04-15 13:59:39 -07:00
Jorim Jaggi
c6eca1da44 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev
am: b3e26a9

* commit 'b3e26a9b414da986963bade0e18a80a20851c74a':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: Ie1982a5e495794e8624c93e970896445579fa98f
2016-04-15 20:54:37 +00:00
TreeHugger Robot
b3e26a9b41 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev 2016-04-15 20:46:40 +00:00
John Reck
f057fb56f6 Fix sw legacy compat path in SurfaceView
Fixes: 28074239

Need to convert from scaled window to screen before
updating position of the SurfaceView

Change-Id: I75dec23408c32ec01e88193ea38b1fb253b3fd6f
2016-04-15 13:46:29 -07:00
Tyler Gunn
5ee2dd9251 Merge "Hide multi-endpoint APIs." into nyc-dev
am: d54c077

* commit 'd54c077d0890ae82f35d6fa658e58ff2a1f1f354':
  Hide multi-endpoint APIs.

Change-Id: Ic77a7bd75346deb745cc9ec252b73259b4409101
2016-04-15 20:35:08 +00:00
Tyler Gunn
d54c077d08 Merge "Hide multi-endpoint APIs." into nyc-dev 2016-04-15 20:28:57 +00:00
John Reck
9e06acf392 Merge "Add a callback for when a gl functor is released" into nyc-dev
am: 85cfc8c

* commit '85cfc8c368523359be8c12b8551e122b94972ab7':
  Add a callback for when a gl functor is released

Change-Id: Ie9f602710d46faf045d04ff425bee8428d6fe9c7
2016-04-15 19:32:51 +00:00