OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 3f45105353
Paul Jensen [Thu, 21 Apr 2016 13:57:12 +0000 (13:57 +0000)]
Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 3f45105353
am: eedfc5457f

* commit 'eedfc5457f5b22f36bc69d8d5c1747cde8169c2a':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: I44df1d666f710f938951820227090c4dbbbb7293

8 years agoMerge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
Paul Jensen [Thu, 21 Apr 2016 13:54:53 +0000 (13:54 +0000)]
Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am: 3f45105353

* commit '3f4510535397bf103d0299440a0299ff8bbeec28':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: Ic664fa080316eff75dd22fc8e84431cb0eb903be

8 years agoMerge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
Paul Jensen [Thu, 21 Apr 2016 13:47:11 +0000 (13:47 +0000)]
Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev

8 years agoMerge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." am: c027ae49f0...
Tobias Thierer [Thu, 21 Apr 2016 13:43:27 +0000 (13:43 +0000)]
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." am: c027ae49f0 am: a2ad95a1e3
am: 7ea07312f5

* commit '7ea07312f5cec98cf39b676afbc7589f17e94e21':
  Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Change-Id: I778b7ad298b7bfed8ffdc9e0be37084ff3123015

8 years agoMerge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." am: c027ae49f0
Tobias Thierer [Thu, 21 Apr 2016 13:41:12 +0000 (13:41 +0000)]
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." am: c027ae49f0
am: a2ad95a1e3

* commit 'a2ad95a1e3933190004d9fb414ea2d54540bf4f2':
  Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Change-Id: I72b7a6d5a36eb10ccf321e8ecb0f24ab6834324a

8 years agoMerge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
Tobias Thierer [Thu, 21 Apr 2016 13:38:52 +0000 (13:38 +0000)]
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
am: c027ae49f0

* commit 'c027ae49f0a941c73c692e1153b2a6623fdae152':
  Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Change-Id: I8cb16c650ea35299a99a878134c3060d4ae6ed1e

8 years agoMerge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
Tobias Thierer [Thu, 21 Apr 2016 13:23:18 +0000 (13:23 +0000)]
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."

8 years agoInteger.valueOf() -> Integer.parseInt() to avoid allocation.
Tobias Thierer [Thu, 21 Apr 2016 11:02:10 +0000 (12:02 +0100)]
Integer.valueOf() -> Integer.parseInt() to avoid allocation.

Bug: 28289401
Change-Id: If767f891644a06ba587f9bb55dccea4089a8c66d

8 years agoMerge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f0...
Android Build Merger (Role) [Thu, 21 Apr 2016 05:33:05 +0000 (05:33 +0000)]
Merge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f022" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
Erik Kline [Thu, 21 Apr 2016 05:32:43 +0000 (05:32 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 50f963f022

* commit '50f963f022e2a847a6218f6ec182f9503854f551':

Change-Id: If0740e57da4d93f1a3b5be71aaa71a5edf52173b

8 years agoMerge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f0...
Android Build Merger (Role) [Thu, 21 Apr 2016 05:31:12 +0000 (05:31 +0000)]
Merge "Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 50f963f022" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
Erik Kline [Thu, 21 Apr 2016 05:30:43 +0000 (05:30 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 0f155c5778

* commit '0f155c5778ed54f3e8dbc579e2709bde1871a46c':
  Expand NetworkMonitor metrics

Change-Id: I476c70c47b85b4ed672156749d371e9092fb869b

8 years agoMerge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
Erik Kline [Thu, 21 Apr 2016 05:30:41 +0000 (05:30 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 50f963f022

* commit '50f963f022e2a847a6218f6ec182f9503854f551':
  Expand NetworkMonitor metrics

Change-Id: I1cd1240937d79c194c885caaf5304a0b761c293b

8 years agoMerge "Expand NetworkMonitor metrics" into nyc-dev
Erik Kline [Thu, 21 Apr 2016 05:28:30 +0000 (05:28 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I1d5475b998b6e29ad8bf43f8e457d9f4db85527a

8 years agoMerge "Expand NetworkMonitor metrics" into nyc-dev
Erik Kline [Thu, 21 Apr 2016 05:28:28 +0000 (05:28 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I6fad2c6fa68c42d161f90abedf83624379b48c8d

8 years agoMerge "Expand NetworkMonitor metrics" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 05:24:38 +0000 (05:24 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev

8 years agoMerge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261f...
Android Build Merger (Role) [Thu, 21 Apr 2016 04:17:35 +0000 (04:17 +0000)]
Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 9fc5843fa8" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
Hugo Benichi [Thu, 21 Apr 2016 04:17:08 +0000 (04:17 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: 9fc5843fa8

* commit '9fc5843fa837c53e9d95733fe74c429e49beb460':

Change-Id: I7d2861350744e3bdefe6f4315d9a6de79d136e1c

8 years agoMerge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261f...
Android Build Merger (Role) [Thu, 21 Apr 2016 04:15:39 +0000 (04:15 +0000)]
Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 9fc5843fa8" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
Hugo Benichi [Thu, 21 Apr 2016 04:15:10 +0000 (04:15 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: eb8372d38c

* commit 'eb8372d38c31af196285d2fee60ae53adb113eca':
  Some fixes in ConnectivityService event logging

Change-Id: Ie356b2df2b84b36e6a2a52d3246ff434557ee89b

8 years agoMerge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
Hugo Benichi [Thu, 21 Apr 2016 04:15:07 +0000 (04:15 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: 9fc5843fa8

* commit '9fc5843fa837c53e9d95733fe74c429e49beb460':
  Some fixes in ConnectivityService event logging

Change-Id: Ib605d0f63a4b7477d56508213da8663cb681b1ef

8 years agoMerge "Some fixes in ConnectivityService event logging" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 04:12:56 +0000 (04:12 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31

8 years agoMerge "Some fixes in ConnectivityService event logging" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 04:12:53 +0000 (04:12 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: Id07df8b694cab22baaa2f9ba849f03bafb9b5590

8 years agoMerge "Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346...
Android Build Merger (Role) [Thu, 21 Apr 2016 04:08:27 +0000 (04:08 +0000)]
Merge "Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167 am: 27656e0352" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167
Hugo Benichi [Thu, 21 Apr 2016 04:08:06 +0000 (04:08 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167
am: 27656e0352

* commit '27656e0352fe2870d755ec9b770ddbc2aab71b52':

Change-Id: I0b8b631b5de16ea31e7de801fbca293550023673

8 years agoMerge "Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346...
Android Build Merger (Role) [Thu, 21 Apr 2016 04:06:35 +0000 (04:06 +0000)]
Merge "Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167 am: 27656e0352" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167
Hugo Benichi [Thu, 21 Apr 2016 04:06:11 +0000 (04:06 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167
am: 27656e0352

* commit '27656e0352fe2870d755ec9b770ddbc2aab71b52':
  Various fixes in IpReachability event logging

Change-Id: Ia3dceb1d659ecee2a76fbfe1c04f3db085d6867e

8 years agoMerge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167
Hugo Benichi [Thu, 21 Apr 2016 04:06:09 +0000 (04:06 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167
am: d8a8ea1e29

* commit 'd8a8ea1e29884cb99538ca7e511b73590e33d553':
  Various fixes in IpReachability event logging

Change-Id: I200825fa90e8a6da6150c1ef66b30d40ea4a865e

8 years agoMerge "Various fixes in IpReachability event logging" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 04:04:01 +0000 (04:04 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev
am: 75f0346167

* commit '75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
  Various fixes in IpReachability event logging

Change-Id: Ibfea132ad824990464e4d488a717d34bd027b891

8 years agoMerge "Various fixes in IpReachability event logging" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 04:03:58 +0000 (04:03 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev
am: 75f0346167

* commit '75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
  Various fixes in IpReachability event logging

Change-Id: Ia20b9ef1a949b6474a5e09b096e6d34e41f316aa

8 years agoMerge "Some fixes in ConnectivityService event logging" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 04:02:54 +0000 (04:02 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev

8 years agoExpand NetworkMonitor metrics
Erik Kline [Fri, 15 Apr 2016 06:49:42 +0000 (15:49 +0900)]
Expand NetworkMonitor metrics

    - add netid to CaptivePortalStateChangeEvent
    - add NetworkMonitorEvent for simple duration measurements

Bug: 28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85

8 years agoMerge "Various fixes in IpReachability event logging" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 03:54:17 +0000 (03:54 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev

8 years agoMerge "Merge "Removed obsolete screenshot mention from full bugreport." into nyc...
Android Build Merger (Role) [Thu, 21 Apr 2016 03:48:53 +0000 (03:48 +0000)]
Merge "Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am: 333e808b34 am: cf63c62a0a" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am...
Felipe Leme [Thu, 21 Apr 2016 03:48:27 +0000 (03:48 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am: 333e808b34
am: cf63c62a0a

* commit 'cf63c62a0ac2f4f56e06c6f1f095f654e4a27982':

Change-Id: I613fa9f866cb874ee8e7140ba29e5c598210d9b8

8 years agoMerge "Merge "Removed obsolete screenshot mention from full bugreport." into nyc...
Android Build Merger (Role) [Thu, 21 Apr 2016 03:46:55 +0000 (03:46 +0000)]
Merge "Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am: 333e808b34 am: cf63c62a0a" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am...
Felipe Leme [Thu, 21 Apr 2016 03:46:25 +0000 (03:46 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am: 333e808b34
am: cf63c62a0a

* commit 'cf63c62a0ac2f4f56e06c6f1f095f654e4a27982':
  Removed obsolete screenshot mention from full bugreport.

Change-Id: I326388f1a11058a203abbb2fa35b6019801a2a90

8 years agoMerge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am...
Felipe Leme [Thu, 21 Apr 2016 03:46:22 +0000 (03:46 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am: 333e808b34
am: abb2d9fee2

* commit 'abb2d9fee27e76b80d9826a4eab2aecc32e854f2':
  Removed obsolete screenshot mention from full bugreport.

Change-Id: I34ba723067093e08a43973740d92aeb19cb9f1cd

8 years agoMerge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
Felipe Leme [Thu, 21 Apr 2016 03:44:15 +0000 (03:44 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
am: 333e808b34

* commit '333e808b34397258457813b6d7d970da72e76925':
  Removed obsolete screenshot mention from full bugreport.

Change-Id: Ieba4b10f6b46e1805e28288b9ada2e48417cf66b

8 years agoMerge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
Felipe Leme [Thu, 21 Apr 2016 03:44:13 +0000 (03:44 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
am: 333e808b34

* commit '333e808b34397258457813b6d7d970da72e76925':
  Removed obsolete screenshot mention from full bugreport.

Change-Id: I28e2617e7ee6efeeea025120637794584cdfd42d

8 years agoMerge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 03:34:45 +0000 (03:34 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev

8 years agoMerge "Remove obsolete TODO" into nyc-dev am: 568e63bc9b
Adrian Roos [Thu, 21 Apr 2016 03:31:14 +0000 (03:31 +0000)]
Merge "Remove obsolete TODO" into nyc-dev am: 568e63bc9b
am: 8047bed6a3

* commit '8047bed6a389e3abfa8fd2d860670f571c7002a3':

Change-Id: I5b0b6995627e840af28d6a7c9206bc8dfce49821

8 years agoMerge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev am: 69e3618f07
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:31:11 +0000 (03:31 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev am: 69e3618f07
am: caad05bf83

* commit 'caad05bf83e9d4158d25865345b7712ca92a51d2':

Change-Id: Ie1168893c2221b5096cef921897a3cec1380f3b5

8 years agoMerge "Remove obsolete TODO" into nyc-dev am: 568e63bc9b
Adrian Roos [Thu, 21 Apr 2016 03:28:22 +0000 (03:28 +0000)]
Merge "Remove obsolete TODO" into nyc-dev am: 568e63bc9b
am: 9d614a55b0

* commit '9d614a55b01ba4baee566f604b4d5bc6b52d389f':
  Remove obsolete TODO

Change-Id: I6fc62d8c996652ebc6b2ef30731915754fa31cda

8 years agoMerge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev am: 69e3618f07
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:28:20 +0000 (03:28 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev am: 69e3618f07
am: 559b2bb8c1

* commit '559b2bb8c1ef1f3f0788b352e7117e1114552700':
  Do not make files in zip disabled in ACTION_VIEW.

Change-Id: Ib0ca69eefc17f469806036f8d0dd0ccf98a185ea

8 years agoMerge "Remove obsolete TODO" into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 03:26:06 +0000 (03:26 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
am: 568e63bc9b

* commit '568e63bc9b53537505016f41e48e908c4da863e5':
  Remove obsolete TODO

Change-Id: I11019dd003ed10184a0c0808b6d1021c5b2ecc40

8 years agoMerge "Remove obsolete TODO" into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 03:26:03 +0000 (03:26 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
am: 568e63bc9b

* commit '568e63bc9b53537505016f41e48e908c4da863e5':
  Remove obsolete TODO

Change-Id: Iaf25259e51d0f4b69d58dc918033299e88aab124

8 years agoMerge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:26:03 +0000 (03:26 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
am: 69e3618f07

* commit '69e3618f07be6f48bfc37c52e6ef5830f717b495':
  Do not make files in zip disabled in ACTION_VIEW.

Change-Id: I9908e4db12640251a5fd60ca0fff950078d628aa

8 years agoMerge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:26:01 +0000 (03:26 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
am: 69e3618f07

* commit '69e3618f07be6f48bfc37c52e6ef5830f717b495':
  Do not make files in zip disabled in ACTION_VIEW.

Change-Id: I6c4749738e1bc6116e4e56c494932a62d2c16ac9

8 years agoMerge "Remove obsolete TODO" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 03:18:46 +0000 (03:18 +0000)]
Merge "Remove obsolete TODO" into nyc-dev

8 years agoMerge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:17:01 +0000 (03:17 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev

8 years agoMerge "Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev...
Android Build Merger (Role) [Thu, 21 Apr 2016 02:51:19 +0000 (02:51 +0000)]
Merge "Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144 am: dc84ddce39" into nyc-mr1-dev-plus-aosp

8 years agoMerge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c6...
Ruchi Kandoi [Thu, 21 Apr 2016 02:50:54 +0000 (02:50 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144
am: dc84ddce39

* commit 'dc84ddce39e19ca37fa2ee0e82205bfaabcacfe7':

Change-Id: I24ad66942da711c0a9596cedc20c5700c8055845

8 years agoMerge "Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev...
Android Build Merger (Role) [Thu, 21 Apr 2016 02:49:20 +0000 (02:49 +0000)]
Merge "Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144 am: dc84ddce39" into nyc-mr1-dev-plus-aosp

8 years agoMerge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c6...
Ruchi Kandoi [Thu, 21 Apr 2016 02:48:58 +0000 (02:48 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144
am: dc84ddce39

* commit 'dc84ddce39e19ca37fa2ee0e82205bfaabcacfe7':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: I885d3053980e170ea086527ecc77a79f2f938f0d

8 years agoMerge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c6...
Ruchi Kandoi [Thu, 21 Apr 2016 02:48:55 +0000 (02:48 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144
am: fb8c76df29

* commit 'fb8c76df299c8bc2f9702697fefc3ebe3e9a3a43':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: Ieb496122f9a6203f5022d5875e4ccbded739dbbc

8 years agoMerge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
Ruchi Kandoi [Thu, 21 Apr 2016 02:46:51 +0000 (02:46 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
am: 316c68f144

* commit '316c68f144946a3019cc8f314921e8588c766b71':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: If4cc351b8674343cbb83e22bcfccf9e7b4d00484

8 years agoMerge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
Ruchi Kandoi [Thu, 21 Apr 2016 02:46:49 +0000 (02:46 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
am: 316c68f144

* commit '316c68f144946a3019cc8f314921e8588c766b71':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: I591073412c162c14800475261936790da3c22ef5

8 years agoMerge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
Ruchi Kandoi [Thu, 21 Apr 2016 02:37:48 +0000 (02:37 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev

8 years agoMerge "Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am...
Android Build Merger (Role) [Thu, 21 Apr 2016 02:20:32 +0000 (02:20 +0000)]
Merge "Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce am: 795939499d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
Nathan Harold [Thu, 21 Apr 2016 02:20:12 +0000 (02:20 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
am: 795939499d

* commit '795939499dbadb93508671841bc5276ee394a511':

Change-Id: Ibb7f50df2398fa908728285e1d33f8d7fc6c2569

8 years agoMerge "Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am...
Android Build Merger (Role) [Thu, 21 Apr 2016 02:18:35 +0000 (02:18 +0000)]
Merge "Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce am: 795939499d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
Nathan Harold [Thu, 21 Apr 2016 02:18:13 +0000 (02:18 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
am: 795939499d

* commit '795939499dbadb93508671841bc5276ee394a511':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: I62f8aaa28c2fed3aada88b9e724b9548f02ec4c9

8 years agoMerge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
Nathan Harold [Thu, 21 Apr 2016 02:18:11 +0000 (02:18 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
am: 2a403859b6

* commit '2a403859b6ef90c30deffd1613c55471d4d1b086':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: Ieaf1840c8025913f4b9691884356d8b7256194ed

8 years agoMerge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
Nathan Harold [Thu, 21 Apr 2016 02:16:03 +0000 (02:16 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40

8 years agoMerge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
Nathan Harold [Thu, 21 Apr 2016 02:16:00 +0000 (02:16 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370

8 years agoMerge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
Nathan Harold [Thu, 21 Apr 2016 02:09:26 +0000 (02:09 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev

8 years agoSome fixes in ConnectivityService event logging
Hugo Benichi [Wed, 20 Apr 2016 03:09:33 +0000 (12:09 +0900)]
Some fixes in ConnectivityService event logging

Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4

8 years agoMerge "Merge "Fix a11y key event handling from multiple devices." into nyc-dev am...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:47:53 +0000 (01:47 +0000)]
Merge "Merge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12 am: 38b5d99620" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
Phil Weaver [Thu, 21 Apr 2016 01:47:26 +0000 (01:47 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
am: 38b5d99620

* commit '38b5d9962030b213f91f8c6998ecf2fca4595694':

Change-Id: I1b7a76c5784067715869bc343ffb4d2ddce2e903

8 years agoMerge "Merge "Fix a11y key event handling from multiple devices." into nyc-dev am...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:45:55 +0000 (01:45 +0000)]
Merge "Merge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12 am: 38b5d99620" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
Phil Weaver [Thu, 21 Apr 2016 01:45:30 +0000 (01:45 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
am: 38b5d99620

* commit '38b5d9962030b213f91f8c6998ecf2fca4595694':
  Fix a11y key event handling from multiple devices.

Change-Id: Ic456bae92dd5756d7c84629116194af64aad2edc

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
Phil Weaver [Thu, 21 Apr 2016 01:45:28 +0000 (01:45 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
am: 09587468a5

* commit '09587468a5b606f5b4ec34040cfa21da19e364c8':
  Fix a11y key event handling from multiple devices.

Change-Id: Ied69b63dcede325c234752e173da464511ee2c37

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev
Phil Weaver [Thu, 21 Apr 2016 01:42:49 +0000 (01:42 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
am: 4b88bddb12

* commit '4b88bddb12a62ec2d791d45e5b995aab87666a7b':
  Fix a11y key event handling from multiple devices.

Change-Id: Ie054d5be82eed912696af2775e382e67e3025bf0

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev
Phil Weaver [Thu, 21 Apr 2016 01:42:48 +0000 (01:42 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
am: 4b88bddb12

* commit '4b88bddb12a62ec2d791d45e5b995aab87666a7b':
  Fix a11y key event handling from multiple devices.

Change-Id: I8da38100a98ab902033cfc290858a8da13c97ccd

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev
Phil Weaver [Thu, 21 Apr 2016 01:38:47 +0000 (01:38 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev

8 years agoRemove obsolete TODO
Adrian Roos [Thu, 21 Apr 2016 01:36:18 +0000 (18:36 -0700)]
Remove obsolete TODO

Change-Id: Ia76b7f1cea0799c46ae5c933741c865869e39f5f
Fixes: 27550895

8 years agoMerge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:29:10 +0000 (01:29 +0000)]
Merge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:29:00 +0000 (01:29 +0000)]
Merge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762 am: 8521feb37d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:28:47 +0000 (01:28 +0000)]
Merge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
Jorim Jaggi [Thu, 21 Apr 2016 01:27:55 +0000 (01:27 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
am: a7c10049af

* commit 'a7c10049af733d464637b96a79e86b2d3713bae1':

Change-Id: Ied385e3ca4c024d7efdd3f142021ff431b29c662

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
Chris Tate [Thu, 21 Apr 2016 01:27:51 +0000 (01:27 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
am: 8521feb37d

* commit '8521feb37d3ca36407aea5e26b426d414c2ddddb':

Change-Id: I7ec87c19864ae9f11c1244af3bd9f83ab27446de

8 years agoMerge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
Jaewan Kim [Thu, 21 Apr 2016 01:27:46 +0000 (01:27 +0000)]
Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
am: d361f2360f

* commit 'd361f2360f6ac682ebc7395b7d63bc334a3b629f':

Change-Id: Id325c213316430c52d3a5ff6e646dd88eb367333

8 years agoMerge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:26:14 +0000 (01:26 +0000)]
Merge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:26:03 +0000 (01:26 +0000)]
Merge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762 am: 8521feb37d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:25:51 +0000 (01:25 +0000)]
Merge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
Jorim Jaggi [Thu, 21 Apr 2016 01:24:59 +0000 (01:24 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
am: a7c10049af

* commit 'a7c10049af733d464637b96a79e86b2d3713bae1':
  Fix IME adjust in SysUI

Change-Id: I93885b7efad1bd93ec844056ab57e4a211108edf

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
Chris Tate [Thu, 21 Apr 2016 01:24:55 +0000 (01:24 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
am: 8521feb37d

* commit '8521feb37d3ca36407aea5e26b426d414c2ddddb':
  Only invoke k/v helpers during k/v operations

Change-Id: I217ddf96f43641adc653ab4368bd5749604468e3

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
Jorim Jaggi [Thu, 21 Apr 2016 01:24:53 +0000 (01:24 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
am: 8364ebd457

* commit '8364ebd4578b918968650edcc5276f26922b7d4f':
  Fix IME adjust in SysUI

Change-Id: Ibc89830dfd4396439e0627de971868fd7bd64863

8 years agoMerge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
Jaewan Kim [Thu, 21 Apr 2016 01:24:51 +0000 (01:24 +0000)]
Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
am: d361f2360f

* commit 'd361f2360f6ac682ebc7395b7d63bc334a3b629f':
  PIP: Support accessibility

Change-Id: I687a54985db8855d4f327795d39fa2d2f7e7bf19

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
Chris Tate [Thu, 21 Apr 2016 01:24:50 +0000 (01:24 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
am: 11c07421da

* commit '11c07421da3e0b419221e2833cac75e9eaec9f48':
  Only invoke k/v helpers during k/v operations

Change-Id: I3508971fa36025630b33c5964f6c4c8f13f0acc8

8 years agoMerge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
Jaewan Kim [Thu, 21 Apr 2016 01:24:47 +0000 (01:24 +0000)]
Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
am: 504c2ada65

* commit '504c2ada6534b44398870b8018ac558e26899cf5':
  PIP: Support accessibility

Change-Id: I098c0b49dc09b2e47845908ff5bd3eff46883ab7

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev
Jorim Jaggi [Thu, 21 Apr 2016 01:20:20 +0000 (01:20 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
am: 54d056ed6d

* commit '54d056ed6d75083ce166eb003fb93efc53cefea5':
  Fix IME adjust in SysUI

Change-Id: I5e7634ff459865622cb5ea819d4358827796e8ae

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Christopher Tate [Thu, 21 Apr 2016 01:20:17 +0000 (01:20 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I802010298db254ffb659b68ec4ac2ac569741a5b

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev
Jorim Jaggi [Thu, 21 Apr 2016 01:20:14 +0000 (01:20 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
am: 54d056ed6d

* commit '54d056ed6d75083ce166eb003fb93efc53cefea5':
  Fix IME adjust in SysUI

Change-Id: I91ed0f07e9f39bbda4c88f1397707e29bfd75101

8 years agoMerge "PIP: Support accessibility" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:20:14 +0000 (01:20 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
am: 34a96e704e

* commit '34a96e704e6bc12cc06d186ad7a344706a8afb5b':
  PIP: Support accessibility

Change-Id: Ida4ae767c45904a18aca577d79c918538125df62

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Christopher Tate [Thu, 21 Apr 2016 01:20:12 +0000 (01:20 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I5d44469ea4b888990109872493d0f5dfb61fd375

8 years agoMerge "PIP: Support accessibility" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:20:10 +0000 (01:20 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
am: 34a96e704e

* commit '34a96e704e6bc12cc06d186ad7a344706a8afb5b':
  PIP: Support accessibility

Change-Id: I1eb23bb5f0db795b9196a7d7e311126ba5cf7e39

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 01:17:55 +0000 (01:17 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Chris Tate [Thu, 21 Apr 2016 01:12:06 +0000 (01:12 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev