Commit Graph

61712 Commits

Author SHA1 Message Date
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
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
Yohei Yukawa
7b574cb8a1 Add more @NonNull/@Nullable to InputMethodSettings.
This follows up to a previous CL [1] for Bug 26279466.

It turns out that we have not clearly defined how nonexistent key should
be handled in InputMethodSettings#getEnabledInputMethodsStr(), e.g. it
returns "" for when mCopyOnWrite is true but returns null when
mCopyOnWrite is false.

Also, since InputMethodSettings now can revert changes made during
mCopyOnWrite is true, the caller may also start receiving null in the
following scenario.
  1. call mSettings.switchCurrentUser(userId, true).
  2. call mSettings.putEnabledInputMethodsStr(str) where str is non-null.
  3. call mSettings.switchCurrentUser(userId, false).
  4. call mSettings.getEnabledInputMethodsStr().
If the caller of getEnabledInputMethodsStr() has assumed that it would
never return null, then it would start crashing due to NPE.

With this CL, getEnabledInputMethodsStr() is marked to be @NonNull we
should no longer see such kind of NPE.

  [1]: I9c6f9bb3d51174198e5f73588637f87ea0d90e11
       68645a638a

Bug: 27687531
Change-Id: I169ad4957e68b65c64251b0849056195b8ca4911
2016-03-16 17:22:22 -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
destradaa
8bad3fec0f Update ContextHubManager's System APIs.
- Consolidates the use of handles in context hub, and nano apps.
- Quick fixes to typos.
- Update the signature to find nano apps to use primitive types

Change-Id: Icffa6fa86e0e33a536516d98bc4674c0a39b2163
2016-03-16 14:05:58 -07:00
Jeff Sharkey
215fe69342 Merge "Remove references to Google packages." into nyc-dev 2016-03-16 20:55:48 +00:00
Jeff Sharkey
237db27c58 Remove references to Google packages.
Bug: 26441633
Change-Id: Iba6566215e2b6d224fd3b9c11d086f5c2db87dca
2016-03-16 14:54:09 -06:00
Jeff Sharkey
c4b0ade245 Merge "Defuse Bundles parsed by the system process." into nyc-dev 2016-03-16 20:52:05 +00:00
Jeff Sharkey
d136e51a99 Defuse Bundles parsed by the system process.
It's easy for apps to throw custom Parcelables into Bundles, but
if the system tries peeking inside one of these Bundles, it triggers
a BadParcelableException.  If that Bundle was passed away from the
Binder thread that delivered it into the system, we end up with a
nasty runtime restart.

This change mitigates this trouble by "defusing" any Bundles parsed by
the system server.  That is, if it encounters BadParcelableException
while unpacking a Bundle, it logs and delivers an empty Bundle as
the result.

Simultaneously, to help catch the system process sticking its
fingers into Bundles that are destined for other processes, a Bundle
now tracks if it's "defusable."  For example, any Intents delivered
through ActivityThread are marked as being defusable, since they've
arrived at their final destination.  Any other Bundles are considered
to be "in transit" and we log if the system tries unparceling them.

Merges several Parcel boolean fields into a flags int.  Add better
docs to several classes.

Bug: 27581063
Change-Id: I28cf3e7439503b5dc9a429bafae5eb48f21f0d93
2016-03-16 14:45:26 -06:00
Adam Powell
9c146bfee7 Refinement for onVisibilityAggregated
Change the args for onVisibilityAggregated to a single boolean for
visibility to the user. Also fix an ordering bug that could trigger a
view background drawable call to setVisible before the view would
respond true to verifyDrawable, which caused issues with some apps.

Bug 27461617
Bug 27689884

Change-Id: I58bdc7c4364264f7fa0863689ba2b76df904ef81
2016-03-16 13:32:01 -07:00
Yigit Boyar
f1f8bfb764 Merge "DO NOT MERGE Fix conditional when checking for confirm key." into nyc-dev 2016-03-16 20:27:21 +00:00
Peng Xu
83d0078f95 Merge "Fix NC caused by race condition in SystemSensorManager" into nyc-dev 2016-03-16 19:30:55 +00:00
Peng Xu
aa957274e7 Fix NC caused by race condition in SystemSensorManager
This change fixes a race condition when two SystemSensorManager
instances are initialized the same time.

Bug: 27334914
Change-Id: I7a886abcbff2ed6f8abf87556a78d1a4afb71f91
2016-03-16 17:46:59 +00:00
Ashutosh Joshi
ac329d3e34 Merge "Exposing Context Hub service." into nyc-dev 2016-03-16 17:21:33 +00:00
Anna Galusza
bc2849449b Merge "Remove Intent to start screen reader tutorial. Reverts ag/867242. Bug: 27218687" into nyc-dev 2016-03-16 17:07:49 +00:00
Julia Reynolds
af56824e35 Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev 2016-03-16 16:48:33 +00:00
Roshan Pius
85eb7a97ef Merge "Fix a bug in ControllerActivityCounter" into nyc-dev 2016-03-16 15:05:14 +00:00
Michal Karpinski
6235a94ffa Unifying method names and comments to security logging, not device logging
Also move SecurityLog to android.app.admin package.

Bug: 27531824
Bug: 27532560
Bug: 27532564
Bug: 27532425
Change-Id: I2677afdb5685bc5d21e52c41b381b57a41e364b6
2016-03-16 14:32:09 +00:00
Esteban Talavera
5fbfa1b0d2 Merge "Clarified documentation as requested by API review" into nyc-dev 2016-03-16 14:24:40 +00:00
Julia Reynolds
48034f89b7 Prevent apps without DND access from toggling DND via AudioService.
Bug: 25395278
Change-Id: Id72830607b01a43848d1261292e5835315ef70d0
2016-03-16 09:33:02 -04:00
Keisuke Kuroyanagi
1c68853fbb Fix: setIntegerPart(long) doesn't set ARG_INTEGER_PART.
Bug: 27689119
Change-Id: I749a1698cda552a0841d6905b81486bf2d74a296
2016-03-16 21:27:20 +09:00
Nicolas Prévot
c25c9032ff Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev 2016-03-16 12:05:35 +00:00
Esteban Talavera
96895cae3e Clarified documentation as requested by API review
Bug: 27532433
Change-Id: I5fada6c0a4636528393308d5ce098cd0398e5ff5
2016-03-16 12:00:40 +00:00
Tony Mak
4dc008cda2 Fix NotificationListenerService fail to mirror work notification
1. Instead of getting application info in runtime, just retrieve the
   one in the context to avoid cross user operation.

2. Functions in PackageManager that retrieve badged icon now return
   badged icon if the targer user is managed profile instead of checking
   whether target user is a managed profile of the user in mContext.

3. Relax the restriction of getUserInfo, if the caller is asking a user
   in the same profile group or having the manage user permission, we let
   it go.

Bug: 26469166

Change-Id: Ia1ffc5743f7d94bd489cdb7571eaed51499ebdd9
2016-03-16 10:49:02 +00:00