Commit Graph

240294 Commits

Author SHA1 Message Date
Jeremy Joslin
d84eee53dc Add a meteredHint to ScoredNetwork. am: 85870d6 am: 30db6d9
am: a0b0a38

* commit 'a0b0a384fb008a375b732531ca7fb984e59de29b':
  Add a meteredHint to ScoredNetwork.
2016-03-17 19:24:02 +00:00
Erik Wolsheimer
f1c831cd8b Merge "Prevent NPE via use of uninitialized mUserManager" into nyc-dev am: 9d07624
am: f41a043

* commit 'f41a043ee341768be0d94d30c11e7fd6784ddca1':
  Prevent NPE via use of uninitialized mUserManager
2016-03-17 19:24:01 +00:00
Selim Gurun
3e5208d3f8 Merge "Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""" into nyc-dev am: ed73839
am: 0900cfe

* commit '0900cfe0a6d49dcfaf533cf34c703d2688909e46':
  Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""
2016-03-17 19:24:00 +00:00
Hangyu Kuang
d4e94f8968 Merge "stagefright: Document that encoders are free to use available tools associated with the speficifed profile." into nyc-dev am: aa8ba08
am: 10bbe6a

* commit '10bbe6aeaeb121e03c9d21a37f751d5fc02f0f61':
  stagefright: Document that encoders are free to use available tools associated with the speficifed profile.
2016-03-17 19:23:59 +00:00
Sid Soundararajan
54cbad0ff7 Merge "Add Transition for App -> Recents on TV." into nyc-dev am: 29f6a9b
am: cdfbdaa

* commit 'cdfbdaa540adcc3a7cf421c216e613c8d034162e':
  Add Transition for App -> Recents on TV.
2016-03-17 19:23:58 +00:00
Yohei Yukawa
ef3704c887 Merge "Remove an unused constructor of InputMethodSettings." into nyc-dev am: 8e1adec
am: 101ef5a

* commit '101ef5ab48d12fb6ffd6567676d2b52905682675':
  Remove an unused constructor of InputMethodSettings.
2016-03-17 19:23:57 +00:00
John Reck
ec76de793d Merge "Fix NPE in clearTexture()" into nyc-dev am: 7882592
am: d48c83d

* commit 'd48c83d6ec6c0b8bd0bc71373827103bb40913d0':
  Fix NPE in clearTexture()
2016-03-17 19:23:57 +00:00
Adrian Roos
fa6a4f1cd3 Merge "Fix some color issues with Inline Reply" into nyc-dev am: bac198d
am: adb5076

* commit 'adb50762bbeedf31799ada11016d548a6044d540':
  Fix some color issues with Inline Reply
2016-03-17 19:23:56 +00:00
Aniroop Mathur
c90431e66c Merge "Sensor: Add batch support for native applications" into nyc-dev am: 9c2e644
am: bfcad70

* commit 'bfcad70e8f2cd31af0d5759963cae5d4e8c64b2b':
  Sensor: Add batch support for native applications
2016-03-17 19:23:55 +00:00
Chris Craik
e1c444b2fe Merge "Fix prep_volantis.sh freq printing" into nyc-dev am: f9e398d
am: 79d911e

* commit '79d911e43a7cdc1c3ea37ddf1954d1ef30e7d662':
  Fix prep_volantis.sh freq printing
2016-03-17 19:09:45 +00:00
Dimitry Ivanov
f6eab2cda1 Merge "Renamed the function initialing nativeloader" into nyc-dev am: 0ee05b3
am: cf04cd3

* commit 'cf04cd30ca8b04a15a6abef7aa30075b2fb0eecf':
  Renamed the function initialing nativeloader
2016-03-17 19:09:44 +00:00
John Reck
e87e1c2e94 Merge "Move updating window position off RT" into nyc-dev am: 969e8c3
am: c101ac9

* commit 'c101ac9cbed842aec1f17f274c302b2df683baf2':
  Move updating window position off RT
2016-03-17 19:09:42 +00:00
Selim Cinek
4c4ecb26a3 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev am: 62dfd5f
am: 8031be0

* commit '8031be0346e2964b1be7ea8ca6b446a0c00864da':
  Decorated custom views now behave better if no custom view is set
2016-03-17 19:09:41 +00:00
Selim Cinek
f4c18717cb Merge "Fixed the motion when expanding notification groups" into nyc-dev am: e17595b
am: 54ddeb5

* commit '54ddeb557e23fbfe33d4c9261a82ace094cec257':
  Fixed the motion when expanding notification groups
2016-03-17 19:09:40 +00:00
Makoto Onuki
20c9b4f5ef Merge "Support multi-launcher" into nyc-dev am: fb3f3f5
am: 7572efa

* commit '7572efad408d94ecbeed28aa7c2a89437ee8ac40':
  Support multi-launcher
2016-03-17 19:09:39 +00:00
Chris Craik
61c3b94e63 Merge "Avoid allocation in methods of Outline" into nyc-dev am: 0b3a9ce
am: 24f9375

* commit '24f9375fbbc384281805c0710e128e36fcf73ec2':
  Avoid allocation in methods of Outline
2016-03-17 19:09:38 +00:00
Christopher Tate
e2a498a97e Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev am: 943c68a
am: 022c4aa

* commit '022c4aa9e270dd0fe0b35cb02e66c6b49db78220':
  Lower the minimum period for periodic jobs to 15 minutes
2016-03-17 19:09:35 +00:00
Jason Monk
6149736603 Merge "Reload cached icons on density change." into nyc-dev am: d1d15bc
am: 5d542e5

* commit '5d542e5897cb7617375247d136d1f777a78425e8':
  Reload cached icons on density change.
2016-03-17 19:09:34 +00:00
Chris Craik
418ca93ed6 Merge "Account for text op stroke in bounds calculation" into nyc-dev am: aefcb2b
am: d856e43

* commit 'd856e437732c7cd2092aaf7f40841f73dc15ab3d':
  Account for text op stroke in bounds calculation
2016-03-17 19:09:33 +00:00
Shubham Ajmera
6147fe3ee5 Merge "Port OpenJDK 8 java.util.Arrays#setAll methods" into nyc-dev am: b108871
am: fb5a6eb

* commit 'fb5a6eba3894565e23ecb2a80b880d7712382d09':
  Port OpenJDK 8 java.util.Arrays#setAll methods
2016-03-17 19:09:31 +00:00
Seigo Nonaka
75ba0d7c98 Merge "Replace hard coded color with equivalent theme value." into nyc-dev am: 74bfa85
am: 160967c

* commit '160967cd1a0cea9f7aa615d8aed6f97db855a442':
  Replace hard coded color with equivalent theme value.
2016-03-17 19:09:29 +00:00
Ricky Wai
928e62aac2 Merge "Fix work notification dismissed in work challenge screen" into nyc-dev am: 7ac1bcc
am: 92add8b

* commit '92add8bf2dcdcacecaca5978fb73c9953536b6dd':
  Fix work notification dismissed in work challenge screen
2016-03-17 19:09:28 +00:00
Todd Kennedy
9c50f15043 Merge "update "dont kill" api" into nyc-dev am: ce71dee
am: cb62438

* commit 'cb624386e6329358c822aca93233e135f3c64f0a':
  update "dont kill" api
2016-03-17 19:09:25 +00:00
Seigo Nonaka
4dd82b3e79 Merge "Stop layout reset by setting empty locale list." into nyc-dev am: eb62f7f
am: f807598

* commit 'f80759878416f963c902747c07d1c55210b8a85a':
  Stop layout reset by setting empty locale list.
2016-03-17 19:09:24 +00:00
Philip P. Moltmann
4ae2d597fc Merge "The PageAdapter update might be caused by the RecylerView." into nyc-dev am: 610bcf3
am: 1822985

* commit '1822985e11032197850ad68a47903ed0487f80be':
  The PageAdapter update might be caused by the RecylerView.
2016-03-17 19:09:23 +00:00
Svetoslav Ganov
a04bd3abaf Merge "Sanitize app op service inputs" into nyc-dev am: 98a41e3
am: 36665d9

* commit '36665d9c4b7e37812a3d2e180b6a0d5711b7a0e5':
  Sanitize app op service inputs
2016-03-17 19:09:22 +00:00
Glenn Kasten
029464aa06 Merge "Use audio_session_t consistently" into nyc-dev am: 58ae278
am: 028f3ae

* commit '028f3aec794cf5413f13ad866de8a56a3b1b5343':
  Use audio_session_t consistently
2016-03-17 19:09:21 +00:00
Chris Wren
86af3dbb56 Merge "don\'t call other services in dump" into nyc-dev am: 8b1918e
am: 98827cf

* commit '98827cf966d6212b0486086b84f885fe5e1e82a1':
  don't call other services in dump
2016-03-17 19:09:20 +00:00
Jason Monk
67dbb6b164 Merge "Fix up label in QS detail" into nyc-dev am: 6a29da0
am: 5a61605

* commit '5a616051ec440134bb52fe2a7767c576509525f6':
  Fix up label in QS detail
2016-03-17 19:09:19 +00:00
Jason Monk
cb6e003020 Merge "Fix Settings home lifecycle" into nyc-dev am: a2e759d
am: 7bd0882

* commit '7bd0882a7a0af3fe127200315791520f0fd70e17':
  Fix Settings home lifecycle
2016-03-17 19:09:17 +00:00
Jason Monk
6e349e8819 Merge "Change drag label while dragging QS tiles" into nyc-dev am: b6408ca
am: 9c93e36

* commit '9c93e364e551eda7b76a87bd20787d820608c9e8':
  Change drag label while dragging QS tiles
2016-03-17 19:09:16 +00:00
Jason Monk
8579beb0ad Merge "Add some synchronization to hotspot callbacks" into nyc-dev am: c049cb9
am: fa3b7a7

* commit 'fa3b7a7f90dd25dd6c50bbf42733a01dfcab1011':
  Add some synchronization to hotspot callbacks
2016-03-17 19:09:15 +00:00
Jason Monk
c12ea10416 Merge "Close overflow when hiding QS editor" into nyc-dev am: 6123bf5
am: 37832f7

* commit '37832f79471ea19b90e64dc74755c4b61bd22f5c':
  Close overflow when hiding QS editor
2016-03-17 19:09:14 +00:00
Yujie Qin
894f458215 Merge "Return DNG mimeType for the case kRAW_SkEncodedFormat" into nyc-dev am: 3509b72
am: 808730b

* commit '808730b001f72ff06c7be355e972da75721313f4':
  Return DNG mimeType for the case kRAW_SkEncodedFormat
2016-03-17 19:09:12 +00:00
Torne (Richard Coles)
6dbb1acf70 Merge "Load WebView library into the right classloader namespace." into nyc-dev am: 3df6390
am: a9603e5

* commit 'a9603e5e283691e9243f439d7b8d01d7722a8163':
  Load WebView library into the right classloader namespace.
2016-03-17 19:09:11 +00:00
Michal Karpinski
8f8e9e3d99 Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev am: c7605b83
am: e165d40

* commit 'e165d40d2d03cde6f8ed8da523b65553de800906':
  Unifying method names and comments to security logging, not device logging
2016-03-17 19:09:08 +00:00
Lorenzo Colitti
e6c88a0c1e Merge changes Idf0cfee8,I27307e2e into nyc-dev am: 7d0e392
am: e77e70d

* commit 'e77e70d00f3da6dd856f2d641d46080fbebacd0a':
  Use native netd binder interface in NetworkManagementService.
  Fix IdleableHandlerThread.
2016-03-17 19:09:06 +00:00
Gustav Sennton
905a306051 Merge "Change wording of WebView Implementation invalid-choice Toast." into nyc-dev am: 4b187ac
am: 6afd0e5

* commit '6afd0e566d046b0694a63df64e1e8423c546fb98':
  Change wording of WebView Implementation invalid-choice Toast.
2016-03-17 19:09:05 +00:00
Seigo Nonaka
64fa2e220e Merge "Fix forgot adding textEditSuggestionHighlightStyle to dark theme." into nyc-dev am: a442076
am: ceb6716

* commit 'ceb67163751f563898f428485bbfabe0c364d1dc':
  Fix forgot adding textEditSuggestionHighlightStyle to dark theme.
2016-03-17 19:09:04 +00:00
Tomasz Mikolajewski
4425fb71d3 Merge "Add a performance test for launching DocumentsUI." into nyc-dev am: f9845b4
am: 056ac71

* commit '056ac7131d8ba448b186234bcc7c4f719433abf5':
  Add a performance test for launching DocumentsUI.
2016-03-17 18:55:15 +00:00
Keisuke Kuroyanagi
b111095a49 Merge "Fix: setExtractedText partial span change handling." into nyc-dev am: cb03689
am: 9034132

* commit '903413269efa13a009bbf9149cee122572804fe4':
  Fix: setExtractedText partial span change handling.
2016-03-17 18:55:14 +00:00
Keisuke Kuroyanagi
9884293440 Merge "Fix: setIntegerPart(long) doesn\'t set ARG_INTEGER_PART." into nyc-dev am: 17db42c
am: 29f54ee

* commit '29f54ee6a12a78282ab0ec252f38f33d0bedba07':
  Fix: setIntegerPart(long) doesn't set ARG_INTEGER_PART.
2016-03-17 18:55:13 +00:00
Tomasz Mikolajewski
e0b77cb68e Update comment for compareToIgnoreCaseNullable(). am: 5cd060a
am: 83fb2a9

* commit '83fb2a9525578729ebf7db412cc9a9cd3e403a4a':
  Update comment for compareToIgnoreCaseNullable().
2016-03-17 18:55:12 +00:00
Daichi Hirono
c05301bee7 Merge "Add suffix number when copying a file." into nyc-dev am: 1360868
am: 43202e7

* commit '43202e7d0de2b244ba0544e2a5dfa00f64e78777':
  Add suffix number when copying a file.
2016-03-17 18:55:11 +00:00
Dan Sandler
30795fe18f Merge "Don\'t clear effects when the panel is fully collapsed." into nyc-dev am: ffaf944
am: 5ed0dab

* commit '5ed0dab415f9a3c6ab02b7c762bd9e3e55f5aa4d':
  Don't clear effects when the panel is fully collapsed.
2016-03-17 18:55:10 +00:00
Jeff Sharkey
8a52153c85 Merge "Oops, missed a default Bundle flag." into nyc-dev am: e6031bf
am: da9a840

* commit 'da9a840c9b766b6c797d63fe104d422699a55cdd':
  Oops, missed a default Bundle flag.
2016-03-17 18:55:09 +00:00
Yohei Yukawa
60efa1620d Merge changes I068f8821,Ibcf12746,I169ad495 into nyc-dev am: fb8aa06
am: 55430e4

* commit '55430e477de6e5aaa5d61ec47b8b519f81a56556':
  Add more @NonNull/@Nullable to TextServicesSettings.
  Remove an unnecessary int to String conversion.
  Add more @NonNull/@Nullable to InputMethodSettings.
2016-03-17 18:55:08 +00:00
Sunny Goyal
c0032cddce Merge "Adding a default implementation for the new Window.Callback method" into nyc-dev am: 60dbc35
am: 04be477

* commit '04be4773d474f165ad4f36f88e78bef82eb2dd4c':
  Adding a default implementation for the new Window.Callback method
2016-03-17 18:55:07 +00:00
Adam Powell
2786405c6c Merge "Refinement for onVisibilityAggregated" into nyc-dev am: 95ee171
am: f929765

* commit 'f929765b78b64e6fcfb4c6747a3fa72db1ae3651':
  Refinement for onVisibilityAggregated
2016-03-17 18:55:05 +00:00
Sudheer Shanka
09243d0451 Merge "Flush package restriction changes for a user." into nyc-dev am: f9124ec
am: 3430c45

* commit '3430c45bcb10ca6ba4c67b2f5e273e3be08b087b':
  Flush package restriction changes for a user.
2016-03-17 18:55:04 +00:00