Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,010 Commits 3 Branches 0 Tags
a0b0a384fb008a375b732531ca7fb984e59de29b
Commit Graph

62242 Commits

Author SHA1 Message Date
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
Yohei Yukawa
101ef5ab48 Merge "Remove an unused constructor of InputMethodSettings." into nyc-dev 
am: 8e1adec

* commit '8e1adec177039a4fe10759548d94071917188df4':
  Remove an unused constructor of InputMethodSettings.
 2016-03-17 18:29:42 +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
Yohei Yukawa
8e1adec177 Merge "Remove an unused constructor of InputMethodSettings." into nyc-dev 2016-03-17 18:13:03 +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
destradaa
3df5814910 Merge "Update ContextHubManager\'s System APIs." into nyc-dev 
am: 5e19f91

* commit '5e19f91585ca82ae58e854491dd67ee2e9f66eba':
  Update ContextHubManager's System APIs.
 2016-03-17 17:35:12 +00:00
Eric Laurent
fa52f2838a Merge "AudioService: do not persist mic mute and master mute" into nyc-dev 
am: 495defd

* commit '495defd74f9a47dec33eb27ca25f5e390bd3fb4a':
  AudioService: do not persist mic mute and master mute
 2016-03-17 17:35:08 +00:00
Jeff Sharkey
cfe811f936 Merge "Remove references to Google packages." into nyc-dev 
am: 215fe69

* commit '215fe69342dcd567299414e26a89bb7d5c3e7185':
  Remove references to Google packages.
 2016-03-17 17:35:07 +00:00
Jeff Sharkey
a0f6318f44 Merge "Defuse Bundles parsed by the system process." into nyc-dev 
am: c4b0ade

* commit 'c4b0ade245fcf6546ac722ac9ce6ddd30b473e68':
  Defuse Bundles parsed by the system process.
 2016-03-17 17:35:04 +00:00
Makoto Onuki
fb3f3f5b28 Merge "Support multi-launcher" into nyc-dev 2016-03-17 17:27:10 +00:00
Chris Tate
943c68ae06 Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev 2016-03-17 17:13:12 +00:00
Todd Kennedy
ce71deefca Merge "update "dont kill" api" into nyc-dev 2016-03-17 15:58:24 +00:00
Roozbeh Pournader
eb62f7f3e4 Merge "Stop layout reset by setting empty locale list." into nyc-dev 2016-03-17 15:46:08 +00:00
Glenn Kasten
58ae278294 Merge "Use audio_session_t consistently" into nyc-dev 2016-03-17 14:22:53 +00:00
Richard Coles
3df6390d2b Merge "Load WebView library into the right classloader namespace." into nyc-dev 2016-03-17 12:52:22 +00:00
Seigo Nonaka
d403151f3d Stop layout reset by setting empty locale list. 
Do not call Configuration.setLocales(empty LocaleList) if the locale
list is empty since Configuration.setLocales calls setLayoutDirection
which resets the layout to LTR.

Bug: 27411138
Change-Id: I7fa9693cdb7ed90267f074812c26ea50314ad839
 2016-03-17 21:18:53 +09:00
Rubin Xu
c7605b838b Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev 2016-03-17 11:23:55 +00:00
Keisuke Kuroyanagi
cb03689fef Merge "Fix: setExtractedText partial span change handling." into nyc-dev 2016-03-17 06:56:24 +00:00
Keisuke Kuroyanagi
17db42cbac Merge "Fix: setIntegerPart(long) doesn't set ARG_INTEGER_PART." into nyc-dev 2016-03-17 06:42:24 +00:00
Yohei Yukawa
e771d58733 Remove an unused constructor of InputMethodSettings. 
The last caller of the deprecated constructor of InputMethodSettings was
just removed [1].  Since it is not a public API, we can now safely
remove it.

  [1]: I09cba4066b95c4a9e89a3e4f83d75b97882502dc
       143a6869476a4be5962d4bba3b222d078f46b9a0

Bug: 26279466
Change-Id: I9035c417d6a8166c0ef4e4c7a00c151ffdd5fb49
 2016-03-17 06:22:23 +00:00
Daichi Hirono
1360868de8 Merge "Add suffix number when copying a file." into nyc-dev 2016-03-17 04:53:35 +00:00
Daichi Hirono
fc7fb7533f Add suffix number when copying a file. 
If we have an existing file in the destination directory, which has the
same name with the source file, adding suffix number is
DocumentsProvider's responsibility.

Because MTP does not provide a way to check existance of files with
given name, the logic is implemented as try-and error strategy. The CL
lets If we MtpDocumentsProvider assume we have a file that shares the
same name with the source file if it failed to invoke
MtpDevice#sendObjectInfo. In this case MtpDocumentsProvider retry to
invoke sendObjectInfo with new name with suffix number.

BUG=26991190

Change-Id: I223ac5031f079bc91eb27709b0356f621a1ed55b
 2016-03-17 13:52:21 +09:00
Jeff Sharkey
e6031bfdd4 Merge "Oops, missed a default Bundle flag." into nyc-dev 2016-03-17 03:24:30 +00:00
Jeff Sharkey
7410fb4b39 Oops, missed a default Bundle flag. 
Bug: 27706598
Change-Id: Idde1c25ea1b5944657075cd5f0da65396280f757
 2016-03-16 21:23:31 -06:00
Yohei Yukawa
fb8aa06883 Merge changes I068f8821,Ibcf12746,I169ad495 into nyc-dev 
* changes:
  Add more @NonNull/@Nullable to TextServicesSettings.
  Remove an unnecessary int to String conversion.
  Add more @NonNull/@Nullable to InputMethodSettings.
 2016-03-17 02:03:00 +00:00
Sunny Goyal
60dbc35784 Merge "Adding a default implementation for the new Window.Callback method" into nyc-dev 2016-03-17 01:50:09 +00:00
Selim Gurun
e319dadaa9 Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces."" 
This reverts commit 7ef5429637.

Change-Id: I03a27148a1df5baf12fb89bca77dcb55a47b6be2
 2016-03-17 01:41:14 +00:00
Yohei Yukawa
ad150ee271 Remove an unnecessary int to String conversion. 
This is a safe refactoring to remove an unnecessary int to String
conversion in TextServicesSettings.

Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE is a integer value that
indicates subtype ID (or SpellCheckerSubtype#hashCode() if the subtype
ID is not specified), and we can just rely on
Settings.Secure#putIntForUser() rather than converting int to String
by ourselves then pass it to Settings.Secure#putStringForUser().

Note that this change is still OK for existing users because
Settings.Secure#putIntForUser() has been internally doing exactly the
same thing.

Bug: 27687531
Change-Id: Ibcf12746f1295c12bec095300ea7f6ced0a51d09
 2016-03-16 17:22:27 -07:00