Commit Graph

49697 Commits

Author SHA1 Message Date
Barnaby James
205379adb2 am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
* commit 'c1e3ac321faea5717e1767bf2091334dde310eb7':
  Minor doc fixes for VoiceInteractor.
2015-07-06 17:18:29 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Raph Levien
28fe20bc82 am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
* commit '401aa9d807bdc568f26cd40bfc96d26449267678':
  Clean up Hyphenator file reading
2015-07-06 16:20:12 +00:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00
Raph Levien
c3f2f7b93b Clean up Hyphenator file reading
The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a
2015-07-06 09:01:36 -07:00
Svet Ganov
2f27b12bfe am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev
* commit '10c111ed35a0282ddf5dda540c53e3831bc9b0ec':
  Show basic feature warning for default granted permissions
2015-07-06 15:56:25 +00:00
Svet Ganov
a91acc9d02 am cb8d2e21: Merge "Improve request permission docs" into mnc-dev
* commit 'cb8d2e21564ec749696dc3095524dafffa915c38':
  Improve request permission docs
2015-07-06 15:56:18 +00:00
Svet Ganov
10c111ed35 Merge "Show basic feature warning for default granted permissions" into mnc-dev 2015-07-06 15:52:01 +00:00
Svet Ganov
cb8d2e2156 Merge "Improve request permission docs" into mnc-dev 2015-07-06 15:48:47 +00:00
George Mount
84d9696212 am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev
* commit '7fe86c4753e88058a7f1a1bf8d0302df9a64bd2e':
  Fix docs for ViewAnimationUtils.createCircularReveal
2015-07-06 14:54:44 +00:00
George Mount
7fe86c4753 Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 2015-07-06 14:39:41 +00:00
Neil Fuller
a8f4499c54 am 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls"
* commit '93bb2bf2e835f714d09b53dea3ca5d9e4451021e':
  Switch to using android.system.Os for more calls
2015-07-04 02:58:40 +00:00
Svet Ganov
255aece7de Improve request permission docs
bug:22252258

Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd
2015-07-03 16:04:00 -07:00
Svet Ganov
77ab6a888a Show basic feature warning for default granted permissions
bug:22174223

Change-Id: Ie8209e1f678ac459893151b5125e86eb5025aad8
2015-07-03 12:19:02 -07:00
Neil Fuller
c80af6d84d Switch to using android.system.Os for more calls
The methods being switched here should involve no important
semantic changes. socket.getSoTimeout() is now implemented:
previously it would have returned 0 in all cases.

Some tidy up of unimplemented / commented code.

Switching other calls to use Os would carry more risk and
will be handled separately they can be switched safely.

Bug: 3106438
Change-Id: I5526249395565fee6e43f159a2b5975b0d41d058
2015-07-03 13:02:08 +01:00
Nicolas Prevot
7c73c23dc7 am 38d7050d: am 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
* commit '38d7050da1de1e0dd98f6f5cd3bca56bfa882247':
  In NfcActivityManager, don't use UserHandle.CURRENT.
2015-07-02 12:54:16 +00:00
Nicolas Prevot
2ee3beedb1 Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev 2015-07-02 12:28:46 +00:00
Nicolas Prevot
b06aece751 am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
* commit 'd16f1252e1e7924a95388a5479d7bb179279f04c':
  Fix the case where an intent bounces several times between users.
2015-07-02 10:52:25 +00:00
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Abodunrinwa Toki
e91d790814 am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
* commit '7099e39f142ff67327ae1a242039fc5f98b76717':
  Add accessibility actions for the PROCESS_TEXT feature.
2015-07-02 02:51:33 +00:00
Abodunrinwa Toki
8fbe1a0cfc Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev 2015-07-02 02:29:34 +00:00
Filip Gruszczynski
9fbb169644 am 545c5b38: am 9f8e1f5d: am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
* commit '545c5b383eee1d477f952490ad7c19e7b17b6e99':
  Handle outsets when resized is called due to rotation.
2015-07-02 01:28:48 +00:00
Jeff Sharkey
b959b1aaea am c6913187: am a5ed2c4d: Merge "Better handling of trim/benchmark results." into mnc-dev
* commit 'c69131874ff0fb82f489f3531fff1ad98913e817':
  Better handling of trim/benchmark results.
2015-07-02 01:02:21 +00:00
Svet Ganov
55cd6f44fd am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev
* commit '6fe87a565be345c9455f610bbf26d5eaee593683':
  Teach receivers, activities, providers, and services app ops.
2015-07-02 01:02:04 +00:00
Keisuke Kuroyanagi
fd2b1f024e am 6ebe0bdc: am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev
* commit '6ebe0bdce26684cb37a2c509a462236f694ae178':
  Fix: Selection handles can remain on home screen.
2015-07-02 01:01:41 +00:00
Dianne Hackborn
9fac4c5905 am 71b97214: am 36e52cdc: Merge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev
* commit '71b972140d4c193fe5e23f3435934a2566459d3d':
  Device idle fixes: issue #22209630 and issue #22225665
2015-07-02 01:01:34 +00:00
Dianne Hackborn
b857216f75 am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev
* commit 'ab33137d68fdb5615d9c6624276d648a0651b953':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
2015-07-02 01:01:27 +00:00
Dianne Hackborn
0783b9a47a am ee987ce4: am 76664d9d: Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit 'ee987ce4206ce741801d7a6193709fdf9867201c':
  Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
2015-07-02 01:01:14 +00:00
Ruben Brunk
0197667ad6 am e0cabf8e: am e4ed4708: Merge "camera2: Fix ABI for new tags." into mnc-dev
* commit 'e0cabf8e936984515100ecb8dcf480e6ddb5a072':
  camera2: Fix ABI for new tags.
2015-07-02 01:00:45 +00:00
Carlos Valdivia
91bda0494e am 46344f66: am 88817de8: Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev
* commit '46344f665e9aa7a48a458c9f9298a8f1f75f4a9b':
  Tweak GET_ACCOUNTS behavior and improve memory.
2015-07-02 01:00:33 +00:00
Svetoslav
90336427fd am 56ef372f: am 29563632: Merge "Grant permissions to headless system calendar/contacts sync adapters." into mnc-dev
* commit '56ef372f5d2b245e06ec5f2c9da4c6e767623a90':
  Grant permissions to headless system calendar/contacts sync adapters.
2015-07-02 01:00:16 +00:00
Filip Gruszczynski
9f8e1f5d04 am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
* commit 'aabc9869a95928660271b7022e2756fff2654013':
  Handle outsets when resized is called due to rotation.
2015-07-02 00:59:48 +00:00
Aravind Akella
da12274e74 am f3d89e7a: am ef8d2bba: Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev
* commit 'f3d89e7a814d936e0dc2fa94165f4a105ded9c25':
  Fix for last sensor missing from sensor list returned by the HAL.
2015-07-02 00:59:36 +00:00
Aravind Akella
b35522f77d am fce3bc83: am 32207e3c: Merge "Changes to Data Injection mode APIs" into mnc-dev
* commit 'fce3bc838f0db1122fee563b14d1c7c7b7d46a9f':
  Changes to Data Injection mode APIs
2015-07-02 00:59:02 +00:00
Filip Gruszczynski
aabc9869a9 am 03850591: Handle outsets when resized is called due to rotation.
* commit '03850591954faf5280fd581dd04cd6958eda0124':
  Handle outsets when resized is called due to rotation.
2015-07-02 00:47:48 +00:00
Robert Schaub
ac00050c72 am 31a084ad: am a5097999: am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
* commit '31a084adf8a234d42c41340610be4c46af229a03':
  docs: Changed link in Java source code comment to repair 404
2015-07-02 00:36:10 +00:00
Jeff Sharkey
a5ed2c4dd3 Merge "Better handling of trim/benchmark results." into mnc-dev 2015-07-02 00:09:16 +00:00
Svet Ganov
68ffcf883c Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 2015-07-01 23:59:21 +00:00
Svet Ganov
99b6043dad Teach receivers, activities, providers, and services app ops.
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
2015-07-01 16:20:00 -07:00
Jeff Sharkey
e8a4b66960 Better handling of trim/benchmark results.
Request benchmarking of devices once per week during normal fstrim
maintenance window.  Tunable parameter gives us the ability to change
frequency through global setting.

Track individual benchmark and trim results for each volume, and
use scrubbed volume identifier (based on adoptiong age) when logging
stats to drop box.  Track last benchmark and trim time for each
volume separately.

Bug: 21831325
Change-Id: I53b3ed788f7820c2e5bceb2840339f5b4aada3f0
2015-07-01 15:48:34 -07:00
Keisuke Kuroyanagi
f3be3ddfd8 Merge "Fix: Selection handles can remain on home screen." into mnc-dev 2015-07-01 22:44:53 +00:00
Dianne Hackborn
36e52cdcd3 Merge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev 2015-07-01 22:33:49 +00:00
Dianne Hackborn
6cc53743f5 Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 2015-07-01 22:31:18 +00:00
Dianne Hackborn
76664d9dcf Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-01 22:21:10 +00:00
Filip Gruszczynski
2b5a6842fd am cc7fa77e: am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev
* commit 'cc7fa77e25e63b79a827816b7eea37bacedf5bff':
  Calculate outset hint when adding window.
2015-07-01 22:06:05 +00:00
John Reck
9bccbf84e9 am 20ff6cd2: am a4ac386d: Merge "Make querying the graphics stats service more defensive" into mnc-dev
* commit '20ff6cd2581a6850b4df5939f96e394a898461be':
  Make querying the graphics stats service more defensive
2015-07-01 22:05:58 +00:00
Dianne Hackborn
3b16cf4f47 Device idle fixes: issue #22209630 and issue #22225665
Issue #22209630: Only allow whitelisted apps to put apps on the temp whitelist

We now check whether the calling app is a system uid or in the whitelist
and, if not, throw an exception.

Issue #22225665: Alarm still goes off in idle mode (doze)

Fix a bug where we were not clearing the calling identity when coming
through the dump command to the service, and as a result when we would
eventually call out to the alarm manager it wouldn't do what we want.
This was only broken when being controlled by the shell.

Also adjust the network policy manager service's handling of device
idle transitions to only toggle the device idle state, which gets rid
of the long delay we have coming out of idle mode.  And add in a bit
of logging around going in/out of idle mode to try to understand where
things may be slow in the future.

Change-Id: I4a41f790e9b0bb31330314b94111557d479f2ba5
2015-07-01 15:05:04 -07:00
Ruben Brunk
e4ed47087f Merge "camera2: Fix ABI for new tags." into mnc-dev 2015-07-01 20:51:17 +00:00
Dianne Hackborn
4e88bcd399 Fix issue #20672970: Notifications are not dismissed on hot word detection
Add new VoiceInteractionSession.closeSystemDialogs() API that closes
everything except the session itself.

Change-Id: If45f1e120d8ca095b6c8055b6485acb5e710820e
2015-07-01 13:41:03 -07:00
Carlos Valdivia
88817de840 Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev 2015-07-01 20:15:45 +00:00