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

59087 Commits

Author SHA1 Message Date
Adam Lesinski
a5c005d992 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: bfdc202 am: ea9d9daf2 
am: 877b275

* commit '877b2750305f173bbb25495de446c377021bf6ae':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I2cf0affd8b90cdb13b4a0db5c76fc4be67b7baab
 2016-04-18 22:43:20 +00:00
Adam Lesinski
877b275030 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: bfdc202 
am: ea9d9daf2

* commit 'ea9d9daf2b70f738c0adad166e9db89c370b5c1c':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I569a7485304241339ab022f74ea8e72a6133c0ef
 2016-04-18 22:38:04 +00:00
Adam Lesinski
bfdc2020b9 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-18 22:24:09 +00:00
Adam Lesinski
b7e1ce0775 Optimize ResTable::getLocales() to improve bindApplication performance 
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: I1ccb6e93cc213810848f07d631d9d8de7c719803
 2016-04-18 15:06:50 -07:00
Wei Wang
0765134cdf Merge "Merge "Use ConnectivityThread for RttManager." into nyc-dev am: f49b51e am: 1bfc472" into nyc-mr1-dev-plus-aosp 
am: c85ae5e

* commit 'c85ae5efdf266bd08a6e0080b9049b950fcf0ed8':
  Use ConnectivityThread for RttManager.

Change-Id: I5dc193b1123a60d8bbd9e125745f4f8517bb7940
 2016-04-18 21:41:44 +00:00
Wei Wang
1bfc472ffa Merge "Use ConnectivityThread for RttManager." into nyc-dev 
am: f49b51e

* commit 'f49b51e000af2d17e315294f9584890d5e93fa33':
  Use ConnectivityThread for RttManager.

Change-Id: Icd3e0adf47fabb86f812b1875aca49379f65ca59
 2016-04-18 21:28:22 +00:00
Wei Wang
f49b51e000 Merge "Use ConnectivityThread for RttManager." into nyc-dev 2016-04-18 21:17:25 +00:00
Jeff Sharkey
8e32a52cd9 Merge "Merge "Consistent creation/destruction of user data." into nyc-dev am: ad14b88 am: 724dd82" into nyc-mr1-dev-plus-aosp 
am: f89add2

* commit 'f89add2a7fe35c8fe25e5563fca8fd1b12a8ddd6':
  Consistent creation/destruction of user data.

Change-Id: I679c8be4aeb6c82045cfee80a38e663a62456d3c
 2016-04-18 20:04:27 +00:00
Jeff Sharkey
724dd82bdc Merge "Consistent creation/destruction of user data." into nyc-dev 
am: ad14b88

* commit 'ad14b884f4110e03ec7b5ba7b913be25d19aa95c':
  Consistent creation/destruction of user data.

Change-Id: Ic9808f80ede52b6ca08cfacb51c9364e4497d2f6
 2016-04-18 19:52:05 +00:00
Jeff Sharkey
ad14b884f4 Merge "Consistent creation/destruction of user data." into nyc-dev 2016-04-18 19:43:18 +00:00
Michael Wright
e6f885912e Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 am: bc57aae am: c348fa3 am: c418909 
am: efb51a0

* commit 'efb51a05afef601ae5286f03ac45558f6dde0849':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0be2af3c08f484ceb69418c5ac044c4d355a0345
 2016-04-18 19:19:36 +00:00
Michael Wright
c418909e9c Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 am: bc57aae 
am: c348fa3

* commit 'c348fa319df3c9980383b904d371ddd93baf5c21':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I52f9cce7770394fa693cc3016b2c1c22e526427d
 2016-04-18 19:08:45 +00:00
Michael Wright
c348fa319d Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 
am: bc57aae

* commit 'bc57aaed0e9ac88a63fa989dba145dc35d048c48':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I7663785a6877f61eaec121303dbdcedcbd242ec6
 2016-04-18 19:03:25 +00:00
Michael Wright
bc57aaed0e Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd 
am: a8064c2

* commit 'a8064c2a8b54881bceade03a9d2f6c1223e055f3':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I4e8d2bff82a3308c5966a0b0c154209b727db669
 2016-04-18 18:57:54 +00:00
Michael Wright
a8064c2a8b Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e 
am: c6629bd

* commit 'c6629bd5dff622a26683269f9201b8d7871c6ef1':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0d602765de707548ede0b1c0a6a38790626e7da1
 2016-04-18 18:52:13 +00:00
Michael Wright
c6629bd5df Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 
am: 224582e

* commit '224582e0403bb123da49d80af21f108900185769':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
 2016-04-18 18:46:44 +00:00
Michael Wright
224582e040 Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 2016-04-18 18:40:19 +00:00
John Reck
a1141701e5 Merge "Merge "Fix NPE checkjni" into nyc-dev am: 2a12c6c am: 660874d" into nyc-mr1-dev-plus-aosp 
am: 1cc94dd

* commit '1cc94dd6e5f2e9b09b6cbe73722aceb9b2795552':
  Fix NPE checkjni

Change-Id: I181b6c0a9b5c8415ab454d88528cbd5f7ef47347
 2016-04-18 18:09:24 +00:00
John Reck
f848f64224 Merge "Fix NPE checkjni" into nyc-dev am: 2a12c6c 
am: 660874d

* commit '660874d1313f950dbddbc309fd50483716a678f4':
  Fix NPE checkjni

Change-Id: I15ab8d4e8a154218de90cb24560be3cabe741a89
 2016-04-18 18:03:44 +00:00
Dan Stoza
aaacb3f3c5 Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev am: 71574c3 am: bbfe7f7 
am: 2785ebc

* commit '2785ebccb4fccc2aa747eab439398e827e2c5d02':
  Revert "Hook up HDR capabilities from native SurfaceControl"

Change-Id: Idf01afd45e5162450078eb48cd9eefe67f36fe8c
 2016-04-18 17:58:21 +00:00
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
Dan Stoza
2785ebccb4 Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev am: 71574c3 
am: bbfe7f7

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

Change-Id: Ib846ac9dd922144ce89ca18aa226aa70f79b32c1
 2016-04-18 17:52:50 +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
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
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
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
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
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