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

64826 Commits

Author SHA1 Message Date
John Reck
6d1ce48ff1 Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev am: 9110429 am: 5cc4428 
am: 0f694e9

* commit '0f694e945a5b82d75b348d4ce89e2409e0131063':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ied8d4602334c13c34fab6b7779fbfdd206bf6103
 2016-04-19 14:59:23 +00:00
John Reck
5cc4428bec Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev 
am: 9110429

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ia7c609029215da17c61eb77bd3279c077d1b7713
 2016-04-19 14:53:31 +00:00
John Reck
9110429f0d Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev 2016-04-19 14:45:16 +00:00
Alan Viverette
49bafd00bb Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev am: 8940a5b am: e24672a 
am: 6df10a7

* commit '6df10a7bd8edca050b14348c2d77e18bed87d0fa':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: Iabe7058e53c1086807afb6350956bd3a9b3a6a52
 2016-04-19 13:48:08 +00:00
Alan Viverette
e24672ac18 Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev 
am: 8940a5b

* commit '8940a5b286295b164ccdd7fd5b1b04171e62e6d1':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: I39220f89c48a8250a8910246382909a1c401d32a
 2016-04-19 13:42:13 +00:00
Alan Viverette
8940a5b286 Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev 2016-04-19 13:36:26 +00:00
Hugo Benichi
f2450e5b5c Merge "Remove unused DHCP timeout event tag." into nyc-dev am: 6e1d1db am: 48b8d14 
am: 9deef0c

* commit '9deef0ceb7668d0029ebc4bb2682edae3b1a63c3':
  Remove unused DHCP timeout event tag.

Change-Id: Ie6381a65faf36894d498ec36b231ede0f0fc0e52
 2016-04-19 07:17:43 +00:00
Hugo Benichi
48b8d14712 Merge "Remove unused DHCP timeout event tag." into nyc-dev 
am: 6e1d1db

* commit '6e1d1dbdd4d48e7997eb0998128ccaa9f8eeee5b':
  Remove unused DHCP timeout event tag.

Change-Id: I3b5497f67819f622548d2039317fa911bd418a8c
 2016-04-19 07:12:31 +00:00
TreeHugger Robot
6e1d1dbdd4 Merge "Remove unused DHCP timeout event tag." into nyc-dev 2016-04-19 07:08:06 +00:00
Hugo Benichi
23e0e805c5 Remove unused DHCP timeout event tag. 
DHCP timeouts should not be logged at DHCPClient level but as a timeout
event in IpManager.

Bug: 28204408
Change-Id: Ia12619e3bf71102cf289cbbcdec53fd5e7e8efff
 2016-04-19 14:26:53 +09:00
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
d1e6bdee64 Merge "Use Activity resources in DecorContext" into nyc-dev am: 6cc3199 am: 99548b7 
am: 1abec27

* commit '1abec2798b7553caeb5249364c9ffc9e98728af7':
  Use Activity resources in DecorContext

Change-Id: I9cd898a917119d199c56e039bfcb80f1afa93376
 2016-04-18 22:43:14 +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
1abec2798b Merge "Use Activity resources in DecorContext" into nyc-dev am: 6cc3199 
am: 99548b7

* commit '99548b7a82987b53aa94cc3146191bb12bd39f51':
  Use Activity resources in DecorContext

Change-Id: I97746cf64ce6e46b86bf2935aa8f38567580e399
 2016-04-18 22:38:02 +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
06c8841483 Merge "Use Activity resources in DecorContext" into nyc-dev 
am: 6cc3199

* commit '6cc31990fc1952b9533cf9b695dd287b87a93e82':
  Use Activity resources in DecorContext

Change-Id: I84b65df4644dc08e252a609a0544138228e9e4c9
 2016-04-18 22:35:24 +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
6cc31990fc Merge "Use Activity resources in DecorContext" into nyc-dev 2016-04-18 22:23:43 +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
Chris Craik
2295f604bf Merge "Improve multi-window render clipping logic" into nyc-dev am: c79c324 am: 2554b09 
am: d424d50

* commit 'd424d505580ef745228f04dba40a55cfa9dc7876':
  Improve multi-window render clipping logic

Change-Id: Idf950bb645d4702e68cffce93f7badef6e50b800
 2016-04-18 20:04:16 +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
Chris Craik
2554b09fc9 Merge "Improve multi-window render clipping logic" into nyc-dev 
am: c79c324

* commit 'c79c3246c9a3e0d2aa34afd18fddc95a6aff0f30':
  Improve multi-window render clipping logic

Change-Id: I4be0f6cefba71f7928fec559481fe389d9de800b
 2016-04-18 19:52:03 +00:00
Jeff Sharkey
ad14b884f4 Merge "Consistent creation/destruction of user data." into nyc-dev 2016-04-18 19:43:18 +00:00
Chris Craik
c79c3246c9 Merge "Improve multi-window render clipping logic" into nyc-dev 2016-04-18 19:40:50 +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
Adam Lesinski
ff22a56ef8 Use Activity resources in DecorContext 
We use the application context in DecorContext to avoid holding a reference
to the Activity. However, the resources don't match the Activity's in a multi-window
world, so we use the resources from the Activity, which  get updated as the Activity
goes between multi-window states. This avoids holding a reference to the Activity.

Bug:28096052
Change-Id: I2804f2420afad6dcecc56e5dece008c390540d72
 2016-04-18 12:14:12 -07: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