Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,294 Commits 3 Branches 0 Tags
d84eee53dcc8a23ee949583f2ff19ff57fc995ca
Commit Graph

57273 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
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
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
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
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
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
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
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
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
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
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
Roozbeh Pournader
c1e4cb1da4 Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev am: 886ad06 
am: fcf4352

* commit 'fcf435294c0eb9bdb0946bf5a44465eaa68d3ae4':
  Clean up BoringLayout#isBoring() a little
 2016-03-17 18:55:03 +00:00
Makoto Onuki
5031e5f97a Merge "Add "pm set-home-activity"" into nyc-dev am: 1b21124 
am: e10a984

* commit 'e10a984bab7667c4780cd952c684ecd915303e5c':
  Add "pm set-home-activity"
 2016-03-17 18:54:46 +00:00
Eino-Ville Talvala
3a12f7e4cd Merge "Adjust graphics dataspace references to new standard" into nyc-dev am: 61adad8 
am: eff923b

* commit 'eff923b3f75692bebe84825985203da277a540c7':
  Adjust graphics dataspace references to new standard
 2016-03-17 18:54:43 +00:00
destradaa
dd15c1e553 Merge "Update ContextHubManager\'s System APIs." into nyc-dev am: 5e19f91 
am: 3df5814

* commit '3df581491088d567da9e8be5ee499b6754db9127':
  Update ContextHubManager's System APIs.
 2016-03-17 18:54:39 +00:00
Eric Laurent
1a1307d4bf Merge "AudioService: do not persist mic mute and master mute" into nyc-dev am: 495defd 
am: fa52f28

* commit 'fa52f2838a02fd065420fcd57ebd41892c54864d':
  AudioService: do not persist mic mute and master mute
 2016-03-17 18:54:32 +00:00
Jeff Sharkey
4f69fe3cf5 Merge "Remove references to Google packages." into nyc-dev am: 215fe69 
am: cfe811f

* commit 'cfe811f936eff449bf212b6aa87417e8c50349b5':
  Remove references to Google packages.
 2016-03-17 18:54:31 +00:00
Jeff Sharkey
7029a23b38 Merge "Defuse Bundles parsed by the system process." into nyc-dev am: c4b0ade 
am: a0f6318

* commit 'a0f6318f44244ec4e916d3abecf157beb4fefc8c':
  Defuse Bundles parsed by the system process.
 2016-03-17 18:54:28 +00:00
Jeremy Joslin
a0b0a384fb Add a meteredHint to ScoredNetwork. am: 85870d6 
am: 30db6d9

* commit '30db6d9325041eaa5f31cb9bb126e050cbd5167e':
  Add a meteredHint to ScoredNetwork.
 2016-03-17 18:51:12 +00:00
Jeremy Joslin
30db6d9325 Add a meteredHint to ScoredNetwork. 
am: 85870d6

* commit '85870d63749b34aed7ad47ae288aebe6d11d8724':
  Add a meteredHint to ScoredNetwork.
 2016-03-17 18:48:59 +00:00
Selim Gurun
0900cfe0a6 Merge "Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""" into nyc-dev 
am: ed73839

* commit 'ed738393af46ffb9b8ded38694555f52a529bbc6':
  Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""
 2016-03-17 18:37:23 +00:00
Selim Gurun
ed738393af Merge "Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""" into nyc-dev 2016-03-17 18:27:54 +00:00
Selim Cinek
8031be0346 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev 
am: 62dfd5f

* commit '62dfd5fe7832d266b72d3ab86eeafec7e7eeba94':
  Decorated custom views now behave better if no custom view is set
 2016-03-17 18:02:13 +00:00
Makoto Onuki
7572efad40 Merge "Support multi-launcher" into nyc-dev 
am: fb3f3f5

* commit 'fb3f3f5b283095cff67ce78b554700958543d4f5':
  Support multi-launcher
 2016-03-17 18:02:11 +00:00
Christopher Tate
022c4aa9e2 Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev 
am: 943c68a

* commit '943c68ae0683c602ef704aa0c0270b93ec8b4154':
  Lower the minimum period for periodic jobs to 15 minutes
 2016-03-17 18:02:08 +00:00
Todd Kennedy
cb624386e6 Merge "update "dont kill" api" into nyc-dev 
am: ce71dee

* commit 'ce71deefca1f5fe53457f6092cda788023669693':
  update "dont kill" api
 2016-03-17 18:02:01 +00:00
Seigo Nonaka
f807598784 Merge "Stop layout reset by setting empty locale list." into nyc-dev 
am: eb62f7f

* commit 'eb62f7f3e4db327366774d5527c56f215a7c9281':
  Stop layout reset by setting empty locale list.
 2016-03-17 18:02:00 +00:00
Glenn Kasten
028f3aec79 Merge "Use audio_session_t consistently" into nyc-dev 
am: 58ae278

* commit '58ae278294017abca0dffc95f006ae646c88db89':
  Use audio_session_t consistently
 2016-03-17 18:01:57 +00:00
Torne (Richard Coles)
a9603e5e28 Merge "Load WebView library into the right classloader namespace." into nyc-dev 
am: 3df6390

* commit '3df6390d2bdf12aaad2465dbe004f8ce84d44389':
  Load WebView library into the right classloader namespace.
 2016-03-17 18:01:47 +00:00
Michal Karpinski
e165d40d2d Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev 
am: c7605b83

* commit 'c7605b838bda61593e503924c6c86e3a33a6d64b':
  Unifying method names and comments to security logging, not device logging
 2016-03-17 18:01:45 +00:00
Jeremy Joslin
85870d6374 Add a meteredHint to ScoredNetwork. 
API changes to allow a meteredHint to be passed
from a network scorer through to the wifi subsystem.

BUG:27702356
Change-Id: Ic466852d855af54c1754c4663388f24f54ed0691
 2016-03-17 10:48:36 -07:00
Selim Cinek
62dfd5fe78 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev 2016-03-17 17:35:48 +00:00
Keisuke Kuroyanagi
903413269e Merge "Fix: setExtractedText partial span change handling." into nyc-dev 
am: cb03689

* commit 'cb03689feff8f2bd31c9db6a3d5d39a2930e42b6':
  Fix: setExtractedText partial span change handling.
 2016-03-17 17:35:37 +00:00
Keisuke Kuroyanagi
29f54ee6a1 Merge "Fix: setIntegerPart(long) doesn\'t set ARG_INTEGER_PART." into nyc-dev 
am: 17db42c

* commit '17db42cbac74885dc3d2d08174b816b168b47d48':
  Fix: setIntegerPart(long) doesn't set ARG_INTEGER_PART.
 2016-03-17 17:35:36 +00:00
Daichi Hirono
43202e7d0d Merge "Add suffix number when copying a file." into nyc-dev 
am: 1360868

* commit '1360868de8a2eb724bd82bc30858c2e345c83482':
  Add suffix number when copying a file.
 2016-03-17 17:35:34 +00:00
Jeff Sharkey
da9a840c9b Merge "Oops, missed a default Bundle flag." into nyc-dev 
am: e6031bf

* commit 'e6031bfdd4f96537d30e9529ba3f3a72c8347d62':
  Oops, missed a default Bundle flag.
 2016-03-17 17:35:32 +00:00
Yohei Yukawa
55430e477d Merge changes I068f8821,Ibcf12746,I169ad495 into nyc-dev 
am: fb8aa06

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

* commit '60dbc357844106fdebb36209c8c86504db323fb9':
  Adding a default implementation for the new Window.Callback method
 2016-03-17 17:35:28 +00:00
Adam Powell
f929765b78 Merge "Refinement for onVisibilityAggregated" into nyc-dev 
am: 95ee171

* commit '95ee171e309bf9c0fe517df3e9817353d9526139':
  Refinement for onVisibilityAggregated
 2016-03-17 17:35:27 +00:00
Sudheer Shanka
3430c45bcb Merge "Flush package restriction changes for a user." into nyc-dev 
am: f9124ec

* commit 'f9124ecad9ec20f572df8cdca6f985ef3f97210d':
  Flush package restriction changes for a user.
 2016-03-17 17:35:25 +00:00
Roozbeh Pournader
fcf435294c Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev 
am: 886ad06

* commit '886ad0690bd3b4e7ee08f032432eefe53a2bdaa9':
  Clean up BoringLayout#isBoring() a little
 2016-03-17 17:35:24 +00:00
Makoto Onuki
e10a984bab Merge "Add "pm set-home-activity"" into nyc-dev 
am: 1b21124

* commit '1b21124d126792e77cdac40c7342adb3486f004b':
  Add "pm set-home-activity"
 2016-03-17 17:35:15 +00:00
Eino-Ville Talvala
eff923b3f7 Merge "Adjust graphics dataspace references to new standard" into nyc-dev 
am: 61adad8

* commit '61adad884b8d5fb8e2aa38b693bc2dce39bf92c8':
  Adjust graphics dataspace references to new standard
 2016-03-17 17:35:13 +00:00