OSDN Git Service
Chad Brubaker [Mon, 24 Feb 2014 18:11:53 +0000 (10:11 -0800)]
am
9862a485: Merge "Only allow System apps to make VPN exempt routes"
* commit '
9862a48574bc088eed97ce8a23b51797e623f863':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Mon, 24 Feb 2014 18:11:50 +0000 (10:11 -0800)]
am
4845037a: Merge "Add the calling package name to requestRouteToHost"
* commit '
4845037a48aa4463028fbea912dcb982a56daaa2':
Add the calling package name to requestRouteToHost
Chad Brubaker [Mon, 24 Feb 2014 18:09:56 +0000 (18:09 +0000)]
Merge "Only allow System apps to make VPN exempt routes"
Chad Brubaker [Mon, 24 Feb 2014 18:09:36 +0000 (18:09 +0000)]
Merge "Add the calling package name to requestRouteToHost"
Chong Zhang [Mon, 24 Feb 2014 17:55:03 +0000 (09:55 -0800)]
am
8440a33b: Merge "support time lapse/slow motion on SURFACE source"
* commit '
8440a33b25d1251701b8597908800551f356ec5b':
support time lapse/slow motion on SURFACE source
Chong Zhang [Mon, 24 Feb 2014 17:52:01 +0000 (17:52 +0000)]
Merge "support time lapse/slow motion on SURFACE source"
Marco Nelissen [Mon, 24 Feb 2014 17:17:03 +0000 (09:17 -0800)]
am
4531e9c4: Merge "Add method to get redirected Uri"
* commit '
4531e9c45cc42c21f6033e52824453b18146a2c0':
Add method to get redirected Uri
Marco Nelissen [Mon, 24 Feb 2014 17:14:28 +0000 (17:14 +0000)]
Merge "Add method to get redirected Uri"
Torne (Richard Coles) [Mon, 24 Feb 2014 14:22:43 +0000 (06:22 -0800)]
am
875e2101: Fix missing # in method name in javadoc.
* commit '
875e2101d71afe7e4acf10b061c942fbf7294775':
Fix missing # in method name in javadoc.
Torne (Richard Coles) [Mon, 24 Feb 2014 14:11:56 +0000 (14:11 +0000)]
Fix missing # in method name in javadoc.
Fix doc generation.
Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
Yohei Yukawa [Mon, 24 Feb 2014 14:03:43 +0000 (06:03 -0800)]
am
e0ebe276: Merge "Remove trailing spaces and tabs"
* commit '
e0ebe276e58cf50719d625631a569bda2f52ff5f':
Remove trailing spaces and tabs
Sander Alewijnse [Mon, 24 Feb 2014 14:03:39 +0000 (06:03 -0800)]
am
627de959: Merge "Enables a profile owner or device owner to set and clear default intent handler activities."
* commit '
627de95925b58e7602374a66ceba76200592ec11':
Enables a profile owner or device owner to set and clear default intent handler activities.
Yohei Yukawa [Mon, 24 Feb 2014 11:20:48 +0000 (11:20 +0000)]
Merge "Remove trailing spaces and tabs"
Yohei Yukawa [Mon, 24 Feb 2014 10:50:40 +0000 (19:50 +0900)]
Remove trailing spaces and tabs
Actual fix will be covered by subsequent patches.
BUG:
12954290
Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
Sander Alewijnse [Mon, 24 Feb 2014 10:16:26 +0000 (10:16 +0000)]
Merge "Enables a profile owner or device owner to set and clear default intent handler activities."
Alan Viverette [Mon, 24 Feb 2014 02:54:47 +0000 (18:54 -0800)]
am
12b97f5d: Change colorFilterColor to tint, allow use of ColorStateList
* commit '
12b97f5d2b15194ed6673c9838b13c8312157709':
Change colorFilterColor to tint, allow use of ColorStateList
Alan Viverette [Mon, 24 Feb 2014 02:32:20 +0000 (18:32 -0800)]
Change colorFilterColor to tint, allow use of ColorStateList
BUG:
13149901
Change-Id: I6487bec372cb74db53d7bbdfa35de071764763b0
Alan Viverette [Sun, 23 Feb 2014 00:56:57 +0000 (16:56 -0800)]
am
cc3f3385: Allow alpha modulation in ColorStateList items
* commit '
cc3f33853b8ea5ce56ebfb14fdc3c000a45e0d78':
Allow alpha modulation in ColorStateList items
Alan Viverette [Sun, 23 Feb 2014 00:52:46 +0000 (16:52 -0800)]
Allow alpha modulation in ColorStateList items
This makes it much easier to define a disabled state color as an alpha
modulation of some base color.
Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
Deepanshu Gupta [Sat, 22 Feb 2014 19:08:57 +0000 (11:08 -0800)]
am
cba616d8: Merge "Update layoutlib tests to check methods return value."
* commit '
cba616d85f16e956928fda5e55bd202a767306c4':
Update layoutlib tests to check methods return value.
Deepanshu Gupta [Sat, 22 Feb 2014 19:04:48 +0000 (19:04 +0000)]
Merge "Update layoutlib tests to check methods return value."
Craig Mautner [Sat, 22 Feb 2014 07:55:39 +0000 (23:55 -0800)]
am
92a50798: am
3dc57b39: am
c004c9a8: am
ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '
92a507986af512d248a1987971b59911406721a9':
Fixes for ActivityView on home activity
Craig Mautner [Sat, 22 Feb 2014 07:51:02 +0000 (07:51 +0000)]
am
3dc57b39: am
c004c9a8: am
ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '
3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
Fixes for ActivityView on home activity
Craig Mautner [Sat, 22 Feb 2014 07:44:51 +0000 (07:44 +0000)]
am
c004c9a8: am
ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '
c004c9a87f0d4afa3a01f39922ad934def93c776':
Fixes for ActivityView on home activity
Craig Mautner [Sat, 22 Feb 2014 07:33:24 +0000 (07:33 +0000)]
am
ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '
ffda464851008f750246f343c939d8003071cd23':
Fixes for ActivityView on home activity
Craig Mautner [Sat, 22 Feb 2014 05:11:22 +0000 (05:11 +0000)]
Merge "Fixes for ActivityView on home activity" into klp-modular-dev
Craig Mautner [Sat, 22 Feb 2014 05:08:00 +0000 (21:08 -0800)]
Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.
Fixes bug
13119389.
Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
Scott Main [Sat, 22 Feb 2014 04:13:01 +0000 (20:13 -0800)]
am
3196d811: am
a0e30c4b: am
5670ddea: am
f8a68404: am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
3196d811d0efc21efd57fed307cfd348492c3074':
add android studio to launch procedures
Scott Main [Sat, 22 Feb 2014 04:10:11 +0000 (04:10 +0000)]
am
a0e30c4b: am
5670ddea: am
f8a68404: am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
a0e30c4b9dc1b0acb019f07c0d124d97740c93a2':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 01:56:08 +0000 (17:56 -0800)]
am
5eb4adcb: resolved conflicts for merge of
d2794f5e to master
* commit '
5eb4adcbda0ff22e48716d3cf9356a9a720475b5':
Reset deferred task removal when app token added.
Craig Mautner [Sat, 22 Feb 2014 01:52:15 +0000 (17:52 -0800)]
resolved conflicts for merge of
d2794f5e to master
Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
Scott Main [Sat, 22 Feb 2014 01:01:18 +0000 (01:01 +0000)]
am
5670ddea: am
f8a68404: am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
5670ddea3bc16c43a2040a5a224ed5fda53d7072':
add android studio to launch procedures
Scott Main [Sat, 22 Feb 2014 00:57:36 +0000 (00:57 +0000)]
am
f8a68404: am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
f8a68404c767cf4e5f3e63ab53737472066a90c1':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 00:57:31 +0000 (00:57 +0000)]
am
21c09e8a: am
f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev
* commit '
21c09e8a58982531f69dcbce760be42528bc9f9d':
Reset deferred task removal when app token added.
Craig Mautner [Sat, 22 Feb 2014 00:53:43 +0000 (00:53 +0000)]
am
f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev
* commit '
f0f454522ae5024645a292596e644c6f7a06853c':
Reset deferred task removal when app token added.
Scott Main [Sat, 22 Feb 2014 00:53:21 +0000 (00:53 +0000)]
am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
271f85399bbbe0b6a6719286a4b0857ff845cfc2':
add android studio to launch procedures
Alan Viverette [Sat, 22 Feb 2014 00:53:14 +0000 (16:53 -0800)]
am
550267f7: Fix refactoring of invalidate methods
* commit '
550267f72b6217f797e7f93bb312ecbe6541ff49':
Fix refactoring of invalidate methods
Craig Mautner [Sat, 22 Feb 2014 00:50:55 +0000 (00:50 +0000)]
Merge "Reset deferred task removal when app token added." into klp-modular-dev
Scott Main [Sat, 22 Feb 2014 00:50:08 +0000 (00:50 +0000)]
am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
b26117aca0daadeb51369c8da617d5b7ba9b05b6':
add android studio to launch procedures
Greg Hackmann [Sat, 22 Feb 2014 00:49:45 +0000 (16:49 -0800)]
am
4418372b: am
5f652b9f: am
0cab896a: resolved conflicts for merge of
9e413bf4 to klp-modular-dev-plus-aosp
* commit '
4418372b21e91f6d4b9e11931dd87a90a023d79e':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Alan Viverette [Sat, 22 Feb 2014 00:48:17 +0000 (16:48 -0800)]
Fix refactoring of invalidate methods
Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from
partial invalidations, though why this should be different is somewhat
of a mystery.
BUG:
13138721
Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
Scott Main [Sat, 22 Feb 2014 00:47:08 +0000 (00:47 +0000)]
am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
25b44ae684295b53ac7ba15d827fc03c51aee37b':
add android studio to launch procedures
Greg Hackmann [Sat, 22 Feb 2014 00:46:52 +0000 (00:46 +0000)]
am
5f652b9f: am
0cab896a: resolved conflicts for merge of
9e413bf4 to klp-modular-dev-plus-aosp
* commit '
5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Craig Mautner [Sat, 22 Feb 2014 00:46:22 +0000 (16:46 -0800)]
Reset deferred task removal when app token added.
A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.
Also added improved debugging.
Fixes bug
12987986.
Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
Scott Main [Sat, 22 Feb 2014 00:43:26 +0000 (00:43 +0000)]
Merge "add android studio to launch procedures" into klp-docs
Greg Hackmann [Sat, 22 Feb 2014 00:42:52 +0000 (00:42 +0000)]
am
0cab896a: resolved conflicts for merge of
9e413bf4 to klp-modular-dev-plus-aosp
* commit '
0cab896a987f6687affd5c50c3bdbe10745c8dff':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Alan Viverette [Sat, 22 Feb 2014 00:40:43 +0000 (16:40 -0800)]
am
3b49a8a6: Fix typo in invalidate
* commit '
3b49a8a629fb66431bf320d0a759299c5383cb06':
Fix typo in invalidate
Alan Viverette [Sat, 22 Feb 2014 00:36:35 +0000 (16:36 -0800)]
Fix typo in invalidate
BUG:
13138721
Change-Id: If7e10208c3ba752eca5f5cbcf26f8a63b1f4ad51
Greg Hackmann [Sat, 22 Feb 2014 00:35:52 +0000 (16:35 -0800)]
resolved conflicts for merge of
9e413bf4 to klp-modular-dev-plus-aosp
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
Alan Viverette [Sat, 22 Feb 2014 00:27:46 +0000 (16:27 -0800)]
am
26b7b8b5: Merge "Fix conditional in invalidateInternal"
* commit '
26b7b8b5870e8e45ccb1ad6aa1ef091cbe81f488':
Fix conditional in invalidateInternal
Adam Lesinski [Sat, 22 Feb 2014 00:24:19 +0000 (16:24 -0800)]
am
4c90185a: am
542b55d9: am
c8661519: am
83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '
4c90185a351fcabdca38e6fa767ddbb1ddc907de':
Fix broken IME when decrypting storage
Alan Viverette [Sat, 22 Feb 2014 00:23:45 +0000 (00:23 +0000)]
Merge "Fix conditional in invalidateInternal"
Deepanshu Gupta [Sat, 22 Feb 2014 00:22:10 +0000 (16:22 -0800)]
Update layoutlib tests to check methods return value.
The test in layoutlib bridge has been updated to check the return
value of the delegate method match the value of the overriden method.
This changeset also fixes the problems found due to this change.
Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
Adam Lesinski [Sat, 22 Feb 2014 00:20:57 +0000 (00:20 +0000)]
am
542b55d9: am
c8661519: am
83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '
542b55d9a4bee2f98f8a0a6948e0873c5faaddc7':
Fix broken IME when decrypting storage
Alan Viverette [Sat, 22 Feb 2014 00:19:06 +0000 (16:19 -0800)]
Fix conditional in invalidateInternal
BUG:
13138721
Change-Id: I433faff7d3e93796dca59ac5b2706c59901558ba
Chad Brubaker [Fri, 14 Feb 2014 21:24:29 +0000 (13:24 -0800)]
Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.
If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.
For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.
Bug:
12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
Alan Viverette [Fri, 21 Feb 2014 23:21:51 +0000 (15:21 -0800)]
am
dc8d7db3: Merge "Fix transient state, accessibility focus in ListView, GridView"
* commit '
dc8d7db35aae71ea747457cc1073fe8d60a8b277':
Fix transient state, accessibility focus in ListView, GridView
Alan Viverette [Fri, 21 Feb 2014 23:19:20 +0000 (23:19 +0000)]
Merge "Fix transient state, accessibility focus in ListView, GridView"
Guang Zhu [Fri, 21 Feb 2014 22:31:41 +0000 (14:31 -0800)]
am
c8124a1e: Merge "add new accessibility action for EditText to set text content"
* commit '
c8124a1e7905a20e221a40546d4cf42b2aaaff45':
add new accessibility action for EditText to set text content
Guang Zhu [Fri, 21 Feb 2014 22:28:22 +0000 (22:28 +0000)]
Merge "add new accessibility action for EditText to set text content"
Adam Lesinski [Fri, 21 Feb 2014 22:19:50 +0000 (22:19 +0000)]
am
c8661519: am
83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '
c866151926b7672a58a7312c8083612bdc567fb4':
Fix broken IME when decrypting storage
Adam Lesinski [Fri, 21 Feb 2014 22:17:26 +0000 (22:17 +0000)]
am
83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '
83930aa09aecef7429d8a1c07b80f10b7e2e13f6':
Fix broken IME when decrypting storage
Adam Lesinski [Fri, 21 Feb 2014 22:13:44 +0000 (22:13 +0000)]
Merge "Fix broken IME when decrypting storage" into klp-modular-dev
Evan Charlton [Fri, 21 Feb 2014 22:12:09 +0000 (22:12 +0000)]
Merge "Fix some javadocs" into master-nova
Evan Charlton [Fri, 21 Feb 2014 21:53:01 +0000 (13:53 -0800)]
Fix some javadocs
Fix some bad {@link ..} tags in the javadocs.
Change-Id: Id64b901218878e9996a390fee9eb72e4b5cd9d93
Adam Lesinski [Fri, 21 Feb 2014 22:06:47 +0000 (14:06 -0800)]
Fix broken IME when decrypting storage
Bug:
13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
Greg Hackmann [Fri, 21 Feb 2014 21:04:00 +0000 (13:04 -0800)]
am
bbfc08b3: Merge changes I6d4fdada,Ia34899a4
* commit '
bbfc08b3abc0934f67659f3238eb79dcac838c17':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Christopher Tate [Fri, 21 Feb 2014 21:03:23 +0000 (13:03 -0800)]
am
9224e045: Merge "Don\'t assume that we\'re at start of file at ctor time"
* commit '
9224e045b3586e96ab43dd166aafe1623b73cfa4':
Don't assume that we're at start of file at ctor time
Greg Hackmann [Fri, 21 Feb 2014 21:01:00 +0000 (21:01 +0000)]
Merge changes I6d4fdada,Ia34899a4
* changes:
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Christopher Tate [Fri, 21 Feb 2014 20:59:45 +0000 (20:59 +0000)]
Merge "Don't assume that we're at start of file at ctor time"
Christopher Tate [Fri, 21 Feb 2014 20:50:21 +0000 (12:50 -0800)]
Don't assume that we're at start of file at ctor time
BackupDataReader / BackupDataWriter were implicitly assuming that when
instantiated, the underlying fd was positioned at start-of-file. If one
tried to e.g. open an existing data stream to append further data to it,
things might randomly fail (at read time, possibly when consuming the
stream later) due to incorrect alignment of the data entities: the
appending writer would assume that no padding was needed to achieve
correct alignment, and this might easily be false.
Now the underlying native reader/writer helpers recognize the true
position within the file when constructed, and as a result it's now
safe to e.g. construct a BackupDataOutput for an existing file and
then append to it.
Change-Id: If0484921e687852f923a4b4efabff573a6c16981
JP Abgrall [Fri, 21 Feb 2014 20:57:51 +0000 (12:57 -0800)]
am
d98fff4a: Merge "ConnectivityService: add support to set TCP initial rwnd"
* commit '
d98fff4a02c50d999190bb68e5a9566f56221848':
ConnectivityService: add support to set TCP initial rwnd
JP Abgrall [Fri, 21 Feb 2014 20:55:13 +0000 (20:55 +0000)]
Merge "ConnectivityService: add support to set TCP initial rwnd"
Santos Cordon [Fri, 21 Feb 2014 01:13:15 +0000 (17:13 -0800)]
Renaming intent to INCOMING_CALL.
Change-Id: I90ac30be5d8503f100deedf44f8d3bd18de3fa83
JP Abgrall [Fri, 21 Feb 2014 20:05:20 +0000 (12:05 -0800)]
ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,
kernel
/proc/sys/net/ipv4/tcp_default_init_rwnd
init.rc (via properties)
net.tcp.default_init_rwnd
properties
net.tcp.default_init_rwnd
gservices
Settings.Global.TCP_DEFAULT_INIT_RWND
Bug:
12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
Marco Nelissen [Fri, 21 Feb 2014 20:00:42 +0000 (12:00 -0800)]
Add method to get redirected Uri
Change-Id: I32c35e1cae89ee1106e8eabff0a4673af8cf57cd
Alan Viverette [Fri, 21 Feb 2014 19:15:56 +0000 (11:15 -0800)]
am
50392322: Merge "Fix scrolling when the bound target offset is too high"
* commit '
503923220cca802f6dfc12f902ab0f6d1a12434f':
Fix scrolling when the bound target offset is too high
Alan Viverette [Fri, 21 Feb 2014 19:13:16 +0000 (19:13 +0000)]
Merge "Fix scrolling when the bound target offset is too high"
Alan Viverette [Fri, 21 Feb 2014 19:11:01 +0000 (11:11 -0800)]
Fix scrolling when the bound target offset is too high
BUG:
13033556
Change-Id: I7a61548d3c604f004726117b40882f84ddf75337
Alan Viverette [Fri, 21 Feb 2014 18:52:10 +0000 (10:52 -0800)]
am
3a4ab768: Merge "Invalidate projection receiver, refactor invalidate methods"
* commit '
3a4ab768a95a249baceef025a8a214fa0c499a16':
Invalidate projection receiver, refactor invalidate methods
Alan Viverette [Fri, 21 Feb 2014 18:49:17 +0000 (18:49 +0000)]
Merge "Invalidate projection receiver, refactor invalidate methods"
Ruben Brunk [Fri, 21 Feb 2014 18:35:44 +0000 (10:35 -0800)]
am
9b30512e: camera3: Fix raw/DNG tag visibilility.
* commit '
9b30512e59c96efe9d77f52b35cac0fa1f1edb96':
camera3: Fix raw/DNG tag visibilility.
Ruben Brunk [Fri, 21 Feb 2014 18:35:41 +0000 (10:35 -0800)]
am
8eb91e9f: Merge "camera3: Add green split property."
* commit '
8eb91e9f281f876322a25c78f776ea74791eaf1c':
camera3: Add green split property.
Ruben Brunk [Fri, 21 Feb 2014 18:25:26 +0000 (10:25 -0800)]
camera3: Fix raw/DNG tag visibilility.
Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
Ruben Brunk [Fri, 21 Feb 2014 18:07:04 +0000 (18:07 +0000)]
Merge "camera3: Add green split property."
Evan Charlton [Fri, 21 Feb 2014 17:59:51 +0000 (17:59 +0000)]
Merge "Update API" into master-nova
Evan Charlton [Fri, 21 Feb 2014 17:58:18 +0000 (09:58 -0800)]
Update API
Forgot to run update-api after
64a44a876b08f4a49238becb90bf1788b840a103
Change-Id: Id9e623b7acadb7b2d8fe5c805cf828f21833f7b9
Greg Hackmann [Tue, 28 Jan 2014 00:30:09 +0000 (16:30 -0800)]
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Setting the time-of-day clock is still useful on systems where the RTC
device is not yet brought up or otherwise unavailable. This matches the
in-kernel behavior of the Android alarm driver.
Change-Id: I6d4fdadab12e241ada7419425efd55bd13873c55
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 20 Feb 2014 00:39:36 +0000 (16:39 -0800)]
Move time setting code from SystemClock to AlarmManagerService
On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls. Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.
By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.
Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).
Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Elliott Hughes [Fri, 21 Feb 2014 17:40:56 +0000 (09:40 -0800)]
am
5784f159: am
48dcf9d5: am
d7d37256: am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
5784f159ab9da9dd89c82926abdda26916503325':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:40:53 +0000 (09:40 -0800)]
am
449e4660: am
0047d3e0: am
e253b514: am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
449e46600f75a21975ceb1c991f768f833ed7fbf':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:37:58 +0000 (17:37 +0000)]
am
48dcf9d5: am
d7d37256: am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
48dcf9d5f59acf53a3ac0eda141ec323534a3321':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:37:54 +0000 (17:37 +0000)]
am
0047d3e0: am
e253b514: am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
0047d3e025b43fd2dc05734f7ea6229291445046':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:33:41 +0000 (17:33 +0000)]
am
d7d37256: am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
d7d37256c4bab388e99dae5e16b80a59756cc97d':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:33:38 +0000 (17:33 +0000)]
am
e253b514: am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
e253b514f4ef74a23c784d2cd893eb035d1c793f':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:28:54 +0000 (17:28 +0000)]
am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
b2f07b27725bed9716114c46df2cf636eb366f6f':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:28:51 +0000 (17:28 +0000)]
am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
29d60b95fa8019c0542f46551057c4d376bb8a7a':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:25:54 +0000 (09:25 -0800)]
am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
4a80927241b3168d9d5138c46c22385d6467a736':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:25:50 +0000 (09:25 -0800)]
am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
8d41e653bae240488281d430309e2d501e9524e5':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:21:52 +0000 (17:21 +0000)]
Merge "Fix documentation for Parcel.readException()."