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

64885 Commits

Author SHA1 Message Date
Robin Lee
e1ee098ab2 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 am: e7c7d77 
am: 5d16439

* commit '5d1643989218a132f570c8d002213089a33ef5ce':
  Move UidRange aidl declaration to system/netd

Change-Id: I899574d6e8ec88049a8bb72e8dc451ebd407bc3a
 2016-04-19 19:34:50 +00:00
Robin Lee
e7c7d77f6f Merge "Move UidRange aidl declaration to system/netd" into nyc-dev 
am: c618468

* commit 'c6184685d8f9b08abf73f83778ca129bb5c9c51d':
  Move UidRange aidl declaration to system/netd

Change-Id: I708ee20cfef47252a4b3ebecd1b2d46886326af4
 2016-04-19 19:28:07 +00:00
Robin Lee
c6184685d8 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev 2016-04-19 19:19:43 +00:00
Seigo Nonaka
c2c0786787 Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767 am: 3de469a 
am: e519b51

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

Change-Id: I2426af56d5659c3e6c67d82cbd449815bb7d0e14
 2016-04-19 18:44:59 +00:00
Raph Levien
e519b51d1d Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767 
am: 3de469a

* commit '3de469a68750e8b9b455a4a5bd3a78ad2ecd4af0':
  Delete emojis before and after ZWJ at the same time.

Change-Id: I826f62aae6baaffea722d8c853cc1d01c8ff41f5
 2016-04-19 18:39:52 +00:00
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
2f9a2fe046 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev am: 9c211a3 am: bf7e134 
am: dbc4e4f

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

Change-Id: I243f791317962d2ab9eea156b0f146f6fcc96fcb
 2016-04-19 18:29:38 +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
ea7984231f Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev am: 6e08a62 am: d42b900 
am: f060af8

* commit 'f060af887bf516fe11b979b1f822f9e559bdc6eb':
  Add wrappers for IConnectivityMetricsLogger functions

Change-Id: I54ba063dc51e5b27a60c8bbe9c3a6bcefa0cda51
 2016-04-19 18:01:29 +00:00
Bo Liu
06a63a753e Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev am: 57b615c am: 39e562d 
am: 49b608a

* commit '49b608a95f2aceef9421d91acf3dd40fac5cc8cb':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I91f5ac6636cd3220196266a1a357df4087f1c4f3
 2016-04-19 17:54:00 +00:00
Pavel Zhamaitsiak
f060af887b Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev am: 6e08a62 
am: d42b900

* commit 'd42b900e303836f5db7c772d70bbe8241ee01ce3':
  Add wrappers for IConnectivityMetricsLogger functions

Change-Id: I73c9a0fd6e3c048c0909fe35a189581bf50795d7
 2016-04-19 17:53:56 +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
Samuel Tan
f7c9c1cb6e Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev am: e749cd3 am: da3b2b7 
am: d20aa36

* commit 'd20aa3666bfdd1e844b278fa0409f6a229c6afcb':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: I1fbdded10a911917a80a4ec88a25111281d224b7
 2016-04-19 17:41:27 +00:00
Bo Liu
57b615c3fd Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev 2016-04-19 17:39:17 +00:00
Samuel Tan
d20aa3666b Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev am: e749cd3 
am: da3b2b7

* commit 'da3b2b7fd793d8f9f767ada6e0ecafaac54d4def':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: Ica2d794be865b7eb05d8a3ad38ea9e2636410a3f
 2016-04-19 17:38:23 +00:00
Samuel Tan
17804abf32 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev 
am: e749cd3

* commit 'e749cd3b15bb14e6dc4ff2724ec1ed56ba269b4c':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: I6c1091f9374d759da67a72703e1f688b8cd1f13d
 2016-04-19 17:35:10 +00:00
Jeff Sharkey
8f218a61af Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f am: 25b3756 
am: 4d341a5

* commit '4d341a5a1c204e4b23fd86cb78b85dd3471c4bb5':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: Id07b89914bcf161ab1a8e9fb1d61b3e2f69c0fe3
 2016-04-19 17:28:55 +00:00
Jeff Sharkey
b3bf559a77 Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad am: ea54db6 
am: df6d014

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

Change-Id: I6458200608363a58c8a769fdcc4d309bb4e8de91
 2016-04-19 17:28:49 +00:00
Samuel Tan
e749cd3b15 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev 2016-04-19 17:25:33 +00:00
Jeff Sharkey
4d341a5a1c Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f 
am: 25b3756

* commit '25b37561104a3dfb5cc52d076f904fe0e8313217':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: Ieba43635739603787daa110a0bf35381c0e09574
 2016-04-19 17:22:36 +00:00
Jeff Sharkey
df6d01463a Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad 
am: ea54db6

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

Change-Id: Ie1bb02c88e7cea2db99da9c06ae2778363f42f1b
 2016-04-19 17:22:34 +00:00
Siyamed Sinir
d200f61031 Merge "Request re-layout after setText if layout width is 0" into nyc-dev am: d01e6f9 am: 5ce80a0 
am: a4c7dcd

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

Change-Id: I0542adea173c486e4644f1e47e4a6fa33e66c796
 2016-04-19 17:19:36 +00:00
Jeff Sharkey
4dc65d31a1 Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 
am: 89fa73f

* commit '89fa73fd7abe0f87634d2914163a8fc79ba2f738':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: I0043da18fabef2c5c916a2e5562d9e613c2b057c
 2016-04-19 17:16:25 +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
Siyamed Sinir
a4c7dcdde9 Merge "Request re-layout after setText if layout width is 0" into nyc-dev am: d01e6f9 
am: 5ce80a0

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

Change-Id: Ic7dd362f57eb10df8cca6fc8b6720cc0f45fc2f1
 2016-04-19 17:13:18 +00:00
Jeff Sharkey
89fa73fd7a Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 2016-04-19 17:11:20 +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
c5b76587c8 Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev am: 0529197 am: e30e53b 
am: 1676842

* commit '167684261147b8184e0e9c55343b1d2bf43827a6':
  Use adjusted popup window position when calculating best-fit

Change-Id: I227e2d127724f44f791af14e0bc3e2fce31af556
 2016-04-19 16:53:52 +00:00
Alan Viverette
ac406894da Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev am: a98cc8b am: 644c400 
am: da9eaa1

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

Change-Id: I89dc8476714260d0166c85e8a8010b13b90e2fd6
 2016-04-19 16:53:47 +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
b424d5600c Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0 am: 2bf9a05 
am: cdc760c

* commit 'cdc760ca3c3772b33e08fbfa8a2346701e97c14c':
  Recreate activity with correct configuration

Change-Id: I9d85a1cd4147e6b173a31eabb439164192dbc8cf
 2016-04-19 16:35:19 +00:00
Andrii Kulian
cdc760ca3c Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0 
am: 2bf9a05

* commit '2bf9a05f08f7e7bfc3f57041a9cfe3b591da4e03':
  Recreate activity with correct configuration

Change-Id: I9c5e383cbeb37c7a3321b1c441c72ef8d305b453
 2016-04-19 16:28:32 +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
de5482672b Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev am: f016d3a am: b64b02f 
am: ac2867b

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

Change-Id: I7cbb81a60c190c9cd1bf7895fa667bef992eba54
 2016-04-19 15:45: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
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
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