Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,261 Commits 3 Branches 0 Tags
c94fd1664edea17450fb360adbbc33b41870b9bc
Commit Graph

58195 Commits

Author SHA1 Message Date
Seigo Nonaka
c94fd1664e Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev 
am: 7ecd767

* commit '7ecd7671b75b2ae7c4d20928722b4a1d41bd62ff':
  Delete emojis before and after ZWJ at the same time.

Change-Id: If877cde7549f0bd0e56c7cbd707e360c8df012fd
 2016-04-19 18:36:15 +00:00
Raph Levien
7ecd7671b7 Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev 2016-04-19 18:31:05 +00:00
Dianne Hackborn
bf7e134316 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev 
am: 9c211a3

* commit '9c211a339689a2e54da3315ccdbf22add472c76a':
  Work on issue #28221912: Starting service as foreground might...

Change-Id: I9f94c6adca6891ac0e43b83f45001092536c7ee9
 2016-04-19 18:18:38 +00:00
Dianne Hackborn
9c211a3396 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev 2016-04-19 18:10:28 +00:00
Pavel Zhamaitsiak
818ed108aa Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev 
am: 6e08a62

* commit '6e08a629c4ed61c4cb1132576422189e03bda965':
  Add wrappers for IConnectivityMetricsLogger functions

Change-Id: I6668a074c83fc73ee2c788b078264888ff5e7c00
 2016-04-19 17:50:42 +00:00
Bo Liu
39e562df80 Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev 
am: 57b615c

* commit '57b615c3fd3f920523b2dd34041cf1e135f5c172':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I715aa5644d405a8e484ddd633e01f5f0336b99b7
 2016-04-19 17:44:19 +00:00
Pavel Zhamaitsiak
6e08a629c4 Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev 2016-04-19 17:41:42 +00:00
Bo Liu
57b615c3fd Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev 2016-04-19 17:39:17 +00:00
Jeff Sharkey
091fba4449 Merge "Disable "defusable" logging for now." into nyc-dev 
am: d3a25ad

* commit 'd3a25ad4b98d717673cb3a81ae1344ff90107d8c':
  Disable "defusable" logging for now.

Change-Id: Ibd04f5de04ada226a210414755de4f80d9d2e889
 2016-04-19 17:16:22 +00:00
Jeff Sharkey
d3a25ad4b9 Merge "Disable "defusable" logging for now." into nyc-dev 2016-04-19 17:10:56 +00:00
Siyamed Sinir
677736bd88 Merge "Request re-layout after setText if layout width is 0" into nyc-dev 
am: d01e6f9

* commit 'd01e6f90832e7b7d55218836aae227452080f9b8':
  Request re-layout after setText if layout width is 0

Change-Id: I1151616a69aebada2f2738ee248734c9352b8f74
 2016-04-19 17:10:15 +00:00
Siyamed Sinir
d01e6f9083 Merge "Request re-layout after setText if layout width is 0" into nyc-dev 2016-04-19 17:00:15 +00:00
Alan Viverette
e30e53bd5f Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev 
am: 0529197

* commit '0529197e9df8837ac63b011937391ff29426e6b5':
  Use adjusted popup window position when calculating best-fit

Change-Id: I92ffd7cd81e20ff97fc44ed98fba3a00a446d558
 2016-04-19 16:47:20 +00:00
Alan Viverette
644c4006ea Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev 
am: a98cc8b

* commit 'a98cc8beb9af5678320b6fae8507dbe2da2c74dc':
  Call OnTimeChangedListener on AM/PM change in clock-style TimePicker

Change-Id: I3f0ab3f7f6d4cf62e251b0f2b6f2370270ae5fb3
 2016-04-19 16:47:18 +00:00
Alan Viverette
0529197e9d Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev 2016-04-19 16:39:15 +00:00
Alan Viverette
a98cc8beb9 Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev 2016-04-19 16:39:09 +00:00
Andrii Kulian
9df97927ab Merge "Recreate activity with correct configuration" into nyc-dev 
am: 5ac2da0

* commit '5ac2da04c1321e8620fc85afae7a168c01ce218b':
  Recreate activity with correct configuration

Change-Id: I0ef3b390763eb10028ce0ad76d2ead9655112926
 2016-04-19 16:25:24 +00:00
Andrii Kulian
5ac2da04c1 Merge "Recreate activity with correct configuration" into nyc-dev 2016-04-19 16:19:05 +00:00
Calin Juravle
b64b02fa9a Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev 
am: f016d3a

* commit 'f016d3aef7711bf6703d9ef053c40afabdaf71a9':
  Move profile registration from bindApplication to LoadedApk

Change-Id: I1aba5c20a14e701da089388f4455cbb76762141b
 2016-04-19 15:38:46 +00:00
TreeHugger Robot
f016d3aef7 Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev 2016-04-19 15:29:19 +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
55f0a99076 Use adjusted popup window position when calculating best-fit 
Bug: 28194522
Bug: 28175404
Change-Id: I5685b397908f64559d0ec5fea5820bdea69f422c
 2016-04-19 10:17:00 -04: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
Alan Viverette
30b57b6bd2 Call OnTimeChangedListener on AM/PM change in clock-style TimePicker 
Bug: 28257554
Change-Id: I25aabac783ea2b6e68be4b6c60f0d55a4c37af26
 2016-04-19 09:29:20 -04:00
Seigo Nonaka
3675d3cd84 Delete emojis before and after ZWJ at the same time. 
Vendor may want to introduce their own ZWJ emoji sequence. To delete
them by one back space as the same behavior of Unicode emoji sequence,
use all emoji as the zwj emoji.

Bug: 28248662
Change-Id: I572dad42ee108476962d4b3fe9f3a6019cb50098
 2016-04-19 18:54:50 +09: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
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
Andrii Kulian
d0ad938760 Recreate activity with correct configuration 
Dialer recreates activity inside onConfigurationChange
when configuration changes significantly. Recreated
activity in this case was initialised with old base version
which resulted in incorrect configuration in split-screen.

This CL updates configuration when activity is created from
override config.

Bug: 27976063
Change-Id: I0ac002a5661154ec25f2d5aba3d44070b683ba2f
 2016-04-18 20:54:20 -07:00
Pavel Zhamaitsiak
c2c39e28f3 Add wrappers for IConnectivityMetricsLogger functions 
Bug: 25691077
Change-Id: I51fa34a4815fb04e33d3b02f0134e3555afc3900
 2016-04-18 17:41:19 -07: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
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 Powell
de7b2ed881 Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev 2016-04-18 23:41:41 +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
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
Siyamed Sinir
375366cb2d Request re-layout after setText if layout width is 0 
When TextView is in a layout with weight params (i.e. LinearLayout) and
the width is set to 0, do not try to prevent requestLayout.

Bug: 27995311
Change-Id: Idfe9d8d0b595a6db95beb1afd83ca96a2bd46546
 2016-04-18 15:17:02 -07: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
Dianne Hackborn
67324c990c Work on issue #28221912: Starting service as foreground might... 
...kill previous notification.

Add new platform API to detach a notification from a service
without dismissing it.

Also, while I am here, add some more @IntDefs.

Change-Id: I3bb46d9cd3db7f73716c8ced19c20fea800eb30d
 2016-04-18 14:48:09 -07: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
cb45951cad Disable "defusable" logging for now. 
Bug: 28240784
Change-Id: I2c259867a8169eef220fb9faea6cdcafdde675b8
 2016-04-18 13:56:11 -06:00