Makoto Onuki
7572efad40
Merge "Support multi-launcher" into nyc-dev
...
am: fb3f3f5
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
2016-03-17 18:02:08 +00:00
Todd Kennedy
cb624386e6
Merge "update "dont kill" api" into nyc-dev
...
am: ce71dee
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
2016-03-17 18:02:00 +00:00
Glenn Kasten
028f3aec79
Merge "Use audio_session_t consistently" into nyc-dev
...
am: 58ae278
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
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
2016-03-17 18:01:45 +00:00
Keisuke Kuroyanagi
903413269e
Merge "Fix: setExtractedText partial span change handling." into nyc-dev
...
am: cb03689
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
2016-03-17 17:35:36 +00:00
Daichi Hirono
43202e7d0d
Merge "Add suffix number when copying a file." into nyc-dev
...
am: 1360868
2016-03-17 17:35:34 +00:00
Jeff Sharkey
da9a840c9b
Merge "Oops, missed a default Bundle flag." into nyc-dev
...
am: e6031bf
2016-03-17 17:35:32 +00:00
Yohei Yukawa
55430e477d
Merge changes I068f8821,Ibcf12746,I169ad495 into nyc-dev
...
am: fb8aa06
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
2016-03-17 17:35:28 +00:00
Adam Powell
f929765b78
Merge "Refinement for onVisibilityAggregated" into nyc-dev
...
am: 95ee171
2016-03-17 17:35:27 +00:00
Sudheer Shanka
3430c45bcb
Merge "Flush package restriction changes for a user." into nyc-dev
...
am: f9124ec
2016-03-17 17:35:25 +00:00
Roozbeh Pournader
fcf435294c
Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev
...
am: 886ad06
2016-03-17 17:35:24 +00:00
Makoto Onuki
e10a984bab
Merge "Add "pm set-home-activity"" into nyc-dev
...
am: 1b21124
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
2016-03-17 17:35:13 +00:00
destradaa
3df5814910
Merge "Update ContextHubManager\'s System APIs." into nyc-dev
...
am: 5e19f91
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
2016-03-17 17:35:08 +00:00
Jeff Sharkey
cfe811f936
Merge "Remove references to Google packages." into nyc-dev
...
am: 215fe69
2016-03-17 17:35:07 +00:00
Jeff Sharkey
a0f6318f44
Merge "Defuse Bundles parsed by the system process." into nyc-dev
...
am: c4b0ade
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
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
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
Sunny Goyal
2a6d9aa1cd
Adding a default implementation for the new Window.Callback method
...
Bug: 27702972
Change-Id: I6b8c1766ecf871801006d4dc47796a819e49bb57
2016-03-16 17:13:26 -07:00
Doris Liu
95ee171e30
Merge "Refinement for onVisibilityAggregated" into nyc-dev
2016-03-16 23:55:04 +00:00
Benjamin Franz
f9124ecad9
Merge "Flush package restriction changes for a user." into nyc-dev
2016-03-16 23:51:44 +00:00
Roozbeh Pournader
886ad0690b
Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev
2016-03-16 23:46:53 +00:00
Makoto Onuki
1b21124d12
Merge "Add "pm set-home-activity"" into nyc-dev
2016-03-16 23:14:04 +00:00
Eino-Ville Talvala
61adad884b
Merge "Adjust graphics dataspace references to new standard" into nyc-dev
2016-03-16 22:49:37 +00:00
Todd Kennedy
24ca5c6d7d
update "dont kill" api
...
* update the name to be more consumer friendly
* expose it as a system api [so zapp can use it]
Change-Id: I11062e360bfd709dd5568409934fec539f64b863
2016-03-16 15:42:01 -07:00
Makoto Onuki
4828a59d68
Add "pm set-home-activity"
...
This is needed to change the default launcher on CTS for
ShortcutManager.
- When the default set with DPM.addPersistentPreferredActivity() is
still stronger.
- Ideally we should unify the code with HomeSettings, but I couldn't
find a good way to do this.
- I didn't make it to work to set the default for any intents
because building an intent filter from a command line would be
painful.
Bug 27548047
Change-Id: I66b153c20c7796147f77214b483112629f9d80c5
2016-03-16 15:21:56 -07:00
Daniel Estrada Alva
5e19f91585
Merge "Update ContextHubManager's System APIs." into nyc-dev
2016-03-16 21:49:12 +00:00
Roozbeh Pournader
3cf8208a62
Clean up BoringLayout#isBoring() a little
...
No functional change. Just some renames and clarifications.
Bug: 23641693
Bug: 27702584
Change-Id: I14efe290a27c695ab79bbb18f9f069c8a2d3ffd6
2016-03-16 14:48:39 -07:00
Eric Laurent
495defd74f
Merge "AudioService: do not persist mic mute and master mute" into nyc-dev
2016-03-16 21:09:31 +00:00
