Neil Fuller
4a2171a81b
am a8f4499c: am 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls"
...
* commit 'a8f4499c54f3375bc72a180bf19b932f114563c3':
Switch to using android.system.Os for more calls
2015-07-06 12:58:51 +00:00
Nicolas Prevot
ce9f639dc3
am 7c73c23d: am 38d7050d: am 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
...
* commit '7c73c23dc7ffba5188fb07391e6555a62c807ea4':
In NfcActivityManager, don't use UserHandle.CURRENT.
2015-07-04 08:07:03 +00:00
Nicolas Prevot
92ebe9a289
am b06aece7: am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
...
* commit 'b06aece751cc86aa859005bbb8843c5ed6be7c6f':
Fix the case where an intent bounces several times between users.
2015-07-04 08:06:54 +00:00
Abodunrinwa Toki
1156b48d5b
am e91d7908: am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
...
* commit 'e91d790814144c7f9fda350aaa96132008020044':
Add accessibility actions for the PROCESS_TEXT feature.
2015-07-04 08:06:01 +00:00
Filip Gruszczynski
fb15033afc
am 9fbb1696: am 545c5b38: am 9f8e1f5d: am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
...
* commit '9fbb16964453087b3cc8a8eb63189c8f8bedbdb8':
Handle outsets when resized is called due to rotation.
2015-07-04 08:05:20 +00:00
Jeff Sharkey
6c1721509a
am b959b1aa: am c6913187: am a5ed2c4d: Merge "Better handling of trim/benchmark results." into mnc-dev
...
* commit 'b959b1aaea9fa64e3eb6cee7ce8e64d8a10657a3':
Better handling of trim/benchmark results.
2015-07-04 07:28:34 +00:00
Svet Ganov
e8ce8368fc
am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev
...
* commit '55cd6f44fd1e49164a999e948bb91a03a3b9daf6':
Teach receivers, activities, providers, and services app ops.
2015-07-04 07:28:18 +00:00
Keisuke Kuroyanagi
e2f22f8e56
am fd2b1f02: am 6ebe0bdc: am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev
...
* commit 'fd2b1f024e85d8e612be1e1b8d1ded9a1ffdc4da':
Fix: Selection handles can remain on home screen.
2015-07-04 07:27:54 +00:00
Dianne Hackborn
9776c69790
am 9fac4c59: am 71b97214: am 36e52cdc: Merge "Device idle fixes: issue #22209630 and issue #22225665 " into mnc-dev
...
* commit '9fac4c590568ae86efe597456955cc4a42ddc8d9':
Device idle fixes: issue #22209630 and issue #22225665
2015-07-04 07:27:47 +00:00
Dianne Hackborn
19b16eb453
am b857216f: am ab33137d: am 6cc53743: Merge "Fix issue #20672970 : Notifications are not dismissed on hot word detection" into mnc-dev
...
* commit 'b857216f75bf18e702ead1e201cbbbc36fba39c6':
Fix issue #20672970 : Notifications are not dismissed on hot word detection
2015-07-04 07:27:38 +00:00
Dianne Hackborn
7e07288c77
am 0783b9a4: am ee987ce4: am 76664d9d: Merge "Work on issue #21589105 : Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev
...
* commit '0783b9a47ae682cc85a14284e79643b5087b8c9f':
Work on issue #21589105 : Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
2015-07-04 07:27:17 +00:00
Ruben Brunk
d60e6af206
am 0197667a: am e0cabf8e: am e4ed4708: Merge "camera2: Fix ABI for new tags." into mnc-dev
...
* commit '0197667ad672fae482366c4d5d86c8cf35286fb6':
camera2: Fix ABI for new tags.
2015-07-04 07:26:33 +00:00
Carlos Valdivia
822d900801
am 91bda049: am 46344f66: am 88817de8: Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev
...
* commit '91bda0494e7d296220b2dec97f0a5165e95fca2b':
Tweak GET_ACCOUNTS behavior and improve memory.
2015-07-04 07:26:11 +00:00
Svetoslav
279a9a3131
am 90336427: am 56ef372f: am 29563632: Merge "Grant permissions to headless system calendar/contacts sync adapters." into mnc-dev
...
* commit '90336427fd1fc85e15a43ce36a26576013061d91':
Grant permissions to headless system calendar/contacts sync adapters.
2015-07-04 07:25:45 +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
Aravind Akella
4f9dd63a87
am da12274e: am f3d89e7a: am ef8d2bba: Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev
...
* commit 'da12274e74597007dce2259c7bc3019a04b4df1e':
Fix for last sensor missing from sensor list returned by the HAL.
2015-07-03 20:35:35 +00:00
Aravind Akella
10d76989ed
am b35522f7: am fce3bc83: am 32207e3c: Merge "Changes to Data Injection mode APIs" into mnc-dev
...
* commit 'b35522f77d0d3d5ed2090214c776c476c8fc76cc':
Changes to Data Injection mode APIs
2015-07-03 20:34:57 +00:00
Robert Schaub
18b46e7a9e
am ac00050c: 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 'ac00050c723498ffd06266374d39e901b08aed2a':
docs: Changed link in Java source code comment to repair 404
2015-07-03 16:47:36 +00: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
Filip Gruszczynski
4aa0ca6619
am 2b5a6842: am cc7fa77e: am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev
...
* commit '2b5a6842fdbb70c153bb691e86ce3fd0ac07ae60':
Calculate outset hint when adding window.
2015-07-03 05:37:25 +00:00
John Reck
18afa57525
am 9bccbf84: am 20ff6cd2: am a4ac386d: Merge "Make querying the graphics stats service more defensive" into mnc-dev
...
* commit '9bccbf84e97bbe7dc77366c551808ea7c9337b48':
Make querying the graphics stats service more defensive
2015-07-03 05:37:17 +00:00
Paul Jensen
00d12e17c1
am 5973eb48: am bf816248: am e51c46b0: Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev
...
* commit '5973eb48220e1e44a4a3192cd9740fe8b47f8a3a':
Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API
2015-07-03 05:35:58 +00:00
George Mount
5e0f7e0fe6
am b7d4fd96: am 0ace7cb1: am cb23ec41: Merge "Add missing addPauseListener." into mnc-dev
...
* commit 'b7d4fd96b91eae007f13a3ba4c29485ee156cc10':
Add missing addPauseListener.
2015-07-03 05:35:50 +00:00
Chris Banes
a55bbdd6b1
am a50db6c6: am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
...
* commit 'a50db6c626f9f2ecc1e5c731e2f76fcd51fd0f4b':
Fix memory leak in setActionProvider() - framework edition
2015-07-03 05:35:10 +00: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