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

59105 Commits

Author SHA1 Message Date
Keisuke Kuroyanagi
e08c03d3ea Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev am: c81b726 am: aa44ba6 
am: 820b721

* commit '820b721d8c31cf3b79fa400d6badf2fdb28d0369':
  Define equals and hashCode for InputDeviceIdentifier.

Change-Id: Icbd6d416837b4fbe8f37c5ebb5f5c46f7df74e7a
 2016-04-19 04:22:48 +00:00
Keisuke Kuroyanagi
aa44ba641e Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev 
am: c81b726

* commit 'c81b726ed1faf195d81d64a1af2e747d58a453df':
  Define equals and hashCode for InputDeviceIdentifier.

Change-Id: Ia99bd3ac27e0418c7534f8bf6a0a122da0a5eaf5
 2016-04-19 04:17:49 +00:00
Keisuke Kuroyanagi
c81b726ed1 Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev 2016-04-19 04:11:16 +00:00
Wale Ogunwale
b7947b49c4 Merge "Use right starting window resource in multi-window mode." into nyc-dev am: 3eefb4c am: a2ce89c 
am: 55ca92d

* commit '55ca92d9a8fc0b0736eadd158ff215da52a82129':
  Use right starting window resource in multi-window mode.

Change-Id: I4c0cf10fcfd19d4a2eff35f098496e1b330221fe
 2016-04-19 00:16:21 +00:00
Wale Ogunwale
a2ce89ce0d Merge "Use right starting window resource in multi-window mode." into nyc-dev 
am: 3eefb4c

* commit '3eefb4c313d0269f7e8bd226bdcc2d039f9e5608':
  Use right starting window resource in multi-window mode.

Change-Id: Iae72368565a49a177dac4db22c1060f7af77f61b
 2016-04-19 00:10:53 +00:00
TreeHugger Robot
3eefb4c313 Merge "Use right starting window resource in multi-window mode." into nyc-dev 2016-04-19 00:04:00 +00:00
Adam Powell
e155dcefca Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev am: de7b2ed am: 76b2c0d 
am: f6267a0

* commit 'f6267a0ac1fcfdd2f83a9b20934bdf4bea9ee65f':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: I38d063ed28041d07f188250408e98c5272be2d11
 2016-04-18 23:56:20 +00:00
Adam Powell
76b2c0d087 Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev 
am: de7b2ed

* commit 'de7b2ed881d75cb7f21ae2199b9af68ae019becf':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: I4bf16f207710cc9b9214d4c97e260a1348c3fe19
 2016-04-18 23:50:51 +00:00
Adam Lesinski
529c1ec13d Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev am: 0d47f4b am: 811c48d 
am: 5b7c57d

* commit '5b7c57d53b08b29f8dc2c05a4193ec9524ce8c60':
  BatteryStats: Introduce Async external stats requests

Change-Id: I6c789ebd217f9ff15f69d6361d0e6fb3b61ff45e
 2016-04-18 23:45:58 +00:00
Adam Powell
de7b2ed881 Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev 2016-04-18 23:41:41 +00:00
Adam Lesinski
5b7c57d53b Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev am: 0d47f4b 
am: 811c48d

* commit '811c48d7f5356719c3110f61a492b5af085a3828':
  BatteryStats: Introduce Async external stats requests

Change-Id: I8a539d26aaea10e64ad35060c17ea6326772e211
 2016-04-18 23:40:58 +00:00
Adam Powell
ef4d99f016 Be bug-compatible with Fragment#setUserVisibleHint < N 
Prior to Android N we were simply checking if a fragment had a
FragmentManager set before we would trigger a deferred
start. Unfortunately this also gets set before a fragment transaction
is committed, so if setUserVisibleHint was called before a transaction
commit, we would start the fragment way too
early. FragmentPagerAdapter triggers this situation.

Unfortunately some apps relied on this timing in overrides of
setUserVisibleHint on their own fragments, and expected, however
erroneously, that after a call to super.setUserVisibleHint their
onStart methods had been run.

Bug 28184671

Change-Id: Ie40d5f6963d312c2fad4a48fb4f992d33e65c83b
 2016-04-18 16:39:22 -07:00
Adam Lesinski
63696c00e2 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 
am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
  BatteryStats: Introduce Async external stats requests

Change-Id: I7319535a0210e38a6bc3731a9f0ec42a4485924f
 2016-04-18 23:38:11 +00:00
Adam Lesinski
0d47f4b646 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 2016-04-18 23:27:10 +00:00
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
af2758a962 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 
am: bfdc202

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

Change-Id: I5148dabc722ec2c31008ba05adb3ccdfa357857a
 2016-04-18 22:35:27 +00:00
Adam Lesinski
bfdc2020b9 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-18 22:24:09 +00:00
Wale Ogunwale
dfc18623ed Use right starting window resource in multi-window mode. 
Use the override configuration for the task the app is contained
in to generate resources for the starting window.

Bug: 28220001
Change-Id: I6fdf39a6d6de41287b44b25861a76f58fe58dd53
 2016-04-18 15:09:34 -07: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