OSDN Git Service
Ned Burns [Thu, 18 Aug 2016 21:32:50 +0000 (17:32 -0400)]
DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()
This value is used to convert ACTION_SCROLL axis values into raw
pixel distances.
CP of ag/
1333603 from master to feldspar-dev. New method is @hide and
@SystemApi in this version. In master, it's part of the new public
API, but feldspar will launch before O.
Change-Id: I5ee73ebcd183c43939ae8aa157e88489e05d4760
Bill Yi [Fri, 19 Aug 2016 15:34:56 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4ecc9d2db4 -s ours
Change-Id: I17a1beb48aad1e8744ecfab50791267ee972b971
Bill Yi [Fri, 19 Aug 2016 15:34:55 +0000 (15:34 +0000)]
Import translations. DO NOT MERGE
am:
02799d57d7 -s ours
Change-Id: I83188fb11d9ca24d92049d8e4ba33b8d2e08a4d0
TreeHugger Robot [Fri, 19 Aug 2016 15:28:48 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 19 Aug 2016 15:28:28 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Tyler Gunn [Fri, 19 Aug 2016 14:32:21 +0000 (14:32 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
am:
9df655a443
Change-Id: Iaa5962749f2c3695c145af84c52a0389a8a0f906
Tyler Gunn [Fri, 19 Aug 2016 14:32:16 +0000 (14:32 +0000)]
Add connection events for indicated when a connection is remotely held.
am:
b5ed860de7
Change-Id: I0ff4ec175ae9c316ba9a31ad225a84248301f252
Tyler Gunn [Fri, 19 Aug 2016 14:28:06 +0000 (14:28 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
Scott Main [Fri, 19 Aug 2016 13:42:14 +0000 (13:42 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
97d6427ab0
am:
c4fb0012e1
Change-Id: I2c313260cb95acc8ef7fc1a416ede9faaf29a938
smain@google.com [Fri, 19 Aug 2016 13:42:12 +0000 (13:42 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
3872e56f69
am:
97fd094458
Change-Id: I55bd31ed3d9b4ce98058ef2478a38cf511b5b85d
Narayan Kamath [Fri, 19 Aug 2016 13:42:09 +0000 (13:42 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
b8f0cd0248
am:
e3cb8a7db9
Change-Id: Iadb326b237e0ff2e23805d46b0331266d81f52f5
Narayan Kamath [Fri, 19 Aug 2016 13:42:07 +0000 (13:42 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
99f960f7da
am:
b060316945
Change-Id: I44662f76bc72770c7c52800933e4423811c76aa9
Scott Main [Fri, 19 Aug 2016 13:29:14 +0000 (13:29 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9
am:
97d6427ab0
Change-Id: Ic8a4e3c86fed503333e6f46d62ad4fd492430547
smain@google.com [Fri, 19 Aug 2016 13:29:12 +0000 (13:29 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9
am:
3872e56f69
Change-Id: I19e1cb6e9f79edb9755afb66cce4a67db9428f7f
Narayan Kamath [Fri, 19 Aug 2016 13:29:10 +0000 (13:29 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
b8f0cd0248
Change-Id: I49cd6679da56f5f853c17c741064db88431ded8c
Narayan Kamath [Fri, 19 Aug 2016 13:29:07 +0000 (13:29 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
99f960f7da
Change-Id: I471c81919cce6725433895c3d20ca22a8e827b98
Christopher Tate [Fri, 19 Aug 2016 13:18:07 +0000 (13:18 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev
am:
1b58e1c821
Change-Id: If350a2fe5b82301f33c5bf16ccd55f3e487c38f7
Christopher Tate [Fri, 19 Aug 2016 13:18:03 +0000 (13:18 +0000)]
Isolated processes don't get precached system service binders
am:
2c61c57ac5
Change-Id: I1902e0b4401d78a5870c36ba48086819910d55ff
Svetoslav Ganov [Fri, 19 Aug 2016 13:17:59 +0000 (13:17 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev
am:
9a6008a334
Change-Id: I6391719f2c978d508c8cd5e29c1d2c9cb173f3d7
Svet Ganov [Fri, 19 Aug 2016 13:17:57 +0000 (13:17 +0000)]
Add resource based mechanism to grant default permissions
am:
59020bffb7
Change-Id: I34d675b7f2ef4fb439bb582c6b36cb00de16acd8
Todd Kennedy [Fri, 19 Aug 2016 13:17:54 +0000 (13:17 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
am:
42b14329f5
Change-Id: I7b6b45115d3ccdf4646395a59c6c572c22b70103
Todd Kennedy [Fri, 19 Aug 2016 13:17:51 +0000 (13:17 +0000)]
Release mPackages lock earlier
am:
a8d4f48997
Change-Id: I4c6a560fed34887eb67db728b4497b28931ae905
Bill Yi [Fri, 19 Aug 2016 11:31:46 +0000 (04:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89cc90bed937b12a939bd4c43f0a6ee834ce088a
Auto-generated-cl: translation import
Bill Yi [Fri, 19 Aug 2016 05:59:03 +0000 (22:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f508568c01e18b729b1e3158c625684c6ffc1d1
Auto-generated-cl: translation import
Scott Main [Fri, 19 Aug 2016 01:12:09 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: Ib72ec2497e7b58c42ecca05cc318d7345e9fce69
smain@google.com [Fri, 19 Aug 2016 01:12:05 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I8614af80ea19a68d078ea578d2f8e7a3286f930a
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
TreeHugger Robot [Fri, 19 Aug 2016 00:29:34 +0000 (00:29 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev
Svetoslav Ganov [Thu, 18 Aug 2016 23:38:32 +0000 (23:38 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev
TreeHugger Robot [Thu, 18 Aug 2016 23:16:01 +0000 (23:16 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
Narayan Kamath [Thu, 18 Aug 2016 23:08:51 +0000 (23:08 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I9e945b2a660d5daf57d7c51e8e7c9d814e78a728
Narayan Kamath [Thu, 18 Aug 2016 23:08:49 +0000 (23:08 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: I530a1f04545a796d22ca59141aa8fe3de349388c
George Mount [Thu, 18 Aug 2016 22:32:14 +0000 (22:32 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
am:
2613fb543a
Change-Id: I82e061d321a935aed4ec9334b51c16d713991d67
George Mount [Thu, 18 Aug 2016 22:32:08 +0000 (22:32 +0000)]
Fix NPE during Activity transition using wrong Activity.
am:
a3edbf6a5d
Change-Id: Ie6ca8f9f9f251eaf844f842e0f6f0ab36a975c1e
Andy Hung [Thu, 18 Aug 2016 22:32:00 +0000 (22:32 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
am:
47c7a8c19a
Change-Id: I8cb76567c8de112d4ac11fbdeaf8880b7ec7c7f9
Andy Hung [Thu, 18 Aug 2016 22:31:53 +0000 (22:31 +0000)]
AudioSystem: Verify audio port array information
am:
737d9fb181
Change-Id: I7a9eeeac4e0f02b4e045b7f277666bd4d3866441
George Mount [Thu, 18 Aug 2016 22:27:27 +0000 (22:27 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
Andy Hung [Thu, 18 Aug 2016 22:25:17 +0000 (22:25 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Tim Murray [Thu, 18 Aug 2016 20:31:00 +0000 (20:31 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
am:
bb4e37c602
Change-Id: Iea2f53fb8a62d3c59a10ca352a8485cd4d0ee326
Tim Murray [Thu, 18 Aug 2016 20:30:58 +0000 (20:30 +0000)]
Prevent FIFO threads from creating more FIFO threads.
am:
38ee337f45
Change-Id: Iecd7619faae5195934335afc0048cc5ddb6b9ab7
Tim Murray [Thu, 18 Aug 2016 20:25:36 +0000 (20:25 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
Svet Ganov [Thu, 18 Aug 2016 19:32:35 +0000 (12:32 -0700)]
Add resource based mechanism to grant default permissions
This CL adds a mechanism for an OEM to grant default permissions
using the build system. This allows permissions for which they
got default grant exceptions to be added without modifying the
platform code. The format is a simple XML listing the packages
and the permissions to be granted for a package. The XML file
is placed in etc/default-permissions.
bug:
29546655
bug:
30929033
Change-Id: Ifb0516d7e2d0b399532024438bc0f86068a2e4e2
Svetoslav Ganov [Thu, 18 Aug 2016 19:12:54 +0000 (19:12 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
am:
6642c963d9
Change-Id: Ibe00e1f3bdf916129355a38beece5378ec379a78
Svet Ganov [Thu, 18 Aug 2016 19:12:50 +0000 (19:12 +0000)]
Grab lock when accessing mutable state
am:
442ed57e4b
Change-Id: Ic8610ed5f0584150d7cda88761bff69dca8d1b42
Svetoslav Ganov [Thu, 18 Aug 2016 19:05:47 +0000 (19:05 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 18:40:25 +0000 (18:40 +0000)]
Protect various Bluetooth broadcasts
am:
9a236066db
Change-Id: I71a84c8486b70d6b94e9656a8a1299a9796d0d52
Todd Kennedy [Thu, 18 Aug 2016 18:22:52 +0000 (11:22 -0700)]
Release mPackages lock earlier
We cannot hold mPackages when calling into generatePackageDexopts().
This method takes Package Manager's mInstallLock. By holding mPackages,
we have lock inversion and hilarity ensues.
Change-Id: Ia11a158677051e3511702f38cde6780e75b256fb
Fixes:
30927731
Tim Murray [Thu, 18 Aug 2016 18:13:26 +0000 (11:13 -0700)]
Prevent FIFO threads from creating more FIFO threads.
SCHED_FIFO threads shouldn't be able to arbitrarily create more
SCHED_FIFO threads.
bug
30898724
Change-Id: I3704b47b88b573313e9b1610556648c8595d4108
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
Bug
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
George Mount [Tue, 16 Aug 2016 20:10:19 +0000 (13:10 -0700)]
Fix NPE during Activity transition using wrong Activity.
Bug
30786309
If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.
Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit
3289bfa289f560d60611dddef9441c9614fd883a)
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
e24a4590bf
Change-Id: I933fe1f6f191e669a7a6ed4d00660a01f95feade
Narayan Kamath [Thu, 18 Aug 2016 10:25:51 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
ac16712d8a
Change-Id: Ief10a90dc77fa8e5cd562a39a6ddbad059353fdf
Narayan Kamath [Thu, 18 Aug 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I1086785cde9f5d9bbdff84b225c4d20582977c75
Narayan Kamath [Thu, 18 Aug 2016 10:19:57 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: I5d496613f53c339c75a3293845670d9d8360c90f
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Bill Yi [Thu, 18 Aug 2016 01:28:19 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4b30053ede -s ours
Change-Id: I28c7df17b56064d5d267de60a0821ebd409b910b
Bill Yi [Thu, 18 Aug 2016 01:28:18 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
9d652db6a4 -s ours
Change-Id: If56739a9258c72a95dd7be524dd3b5c21bfd34ed
TreeHugger Robot [Thu, 18 Aug 2016 01:23:04 +0000 (01:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Adam Lesinski [Thu, 18 Aug 2016 01:19:56 +0000 (01:19 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev
am:
1af694510d
Change-Id: I60d96424e94226a85ef9fe79aba571b2329ee96e
Adam Lesinski [Thu, 18 Aug 2016 01:19:51 +0000 (01:19 +0000)]
AppIdleHistory: Only write screen on durations during regular sync
am:
f2d87eba75
Change-Id: I7e5a6d89afa813fdb68c68d201ad04971641dabd
TreeHugger Robot [Thu, 18 Aug 2016 01:14:31 +0000 (01:14 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev
Andy Hung [Wed, 17 Aug 2016 01:38:49 +0000 (18:38 -0700)]
AudioSystem: Verify audio port array information
Bug:
30737845
Change-Id: Id092086862bc527fccc5e9f34c8a3ab16167ae92
Svet Ganov [Thu, 18 Aug 2016 00:29:43 +0000 (17:29 -0700)]
Grab lock when accessing mutable state
bug:
30881375
Change-Id: Ied52fd9666f28b5c2038144b85cd74480ccfde43
Adam Lesinski [Wed, 17 Aug 2016 22:21:16 +0000 (15:21 -0700)]
AppIdleHistory: Only write screen on durations during regular sync
Stop writing to disk every time the display goes off. Only write to
disk periodically.
Consequences
Previously, if the device rebooted after the screen duration was written
to disk, apps would appear more stale than they actually were.
Now apps will always look fresher, which is a better scenario.
Bug:
30807864
Change-Id: Ia69a2e51fc9e397789215b449fae56fa3e29c74a
Jim Miller [Wed, 17 Aug 2016 23:33:13 +0000 (23:33 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b am:
e3457fc127
am:
669a153531
Change-Id: Ia8a9962fdbf010066b6fd72ed4ccdc35548571f9
Jim Miller [Wed, 17 Aug 2016 23:26:57 +0000 (23:26 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b
am:
e3457fc127
Change-Id: I1bc40c141498e62cad36acc9568177cb88debc11
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Dirk Dougherty [Wed, 17 Aug 2016 23:08:17 +0000 (23:08 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev am:
96855c49a6
am:
4fa4b29890
Change-Id: Id9260b2dc3be5840d3322ea7d5a6f90d0e62e117
Dirk Dougherty [Wed, 17 Aug 2016 23:08:15 +0000 (23:08 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am:
b042ab1eb6
am:
d66ec65b77
Change-Id: If34b51e4685f18a066dc21c794a88f7d4d03bc22
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Dirk Dougherty [Wed, 17 Aug 2016 22:59:31 +0000 (22:59 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
am:
96855c49a6
Change-Id: If07272ee0de59b546df04f0232219bb0954da582
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Dirk Dougherty [Wed, 17 Aug 2016 22:59:23 +0000 (22:59 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
am:
b042ab1eb6
Change-Id: I725ff3bce89572d06f76dd9f1860365514d27d56
Dirk Dougherty [Wed, 17 Aug 2016 22:53:23 +0000 (22:53 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
Bill Yi [Wed, 17 Aug 2016 22:33:39 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30362824
Change-Id: I319b881d2a02816d932688c70c61f4ad2b315ef8
Narayan Kamath [Wed, 17 Aug 2016 22:11:13 +0000 (22:11 +0000)]
Merge "BackgroundDexOptService: Check for low storage conditions." into nyc-mr1-dev
am:
712dde29ff
Change-Id: I717fe1f5cbc7ca19044325a65721bdb389a38097
Narayan Kamath [Wed, 17 Aug 2016 22:11:09 +0000 (22:11 +0000)]
BackgroundDexOptService: Check for low storage conditions.
am:
8735f07a69
Change-Id: Iec5fc8bf8291f7ed04ebeda26190f498b555069d
TreeHugger Robot [Wed, 17 Aug 2016 22:07:12 +0000 (22:07 +0000)]
Merge "BackgroundDexOptService: Check for low storage conditions." into nyc-mr1-dev
Adam Lesinski [Wed, 17 Aug 2016 21:51:15 +0000 (21:51 +0000)]
Merge "AAPT: Handle gaps in resources when building splits" into nyc-mr1-dev
am:
c1a36814e5
Change-Id: I67ad7adede8463fe3f670af949e9c3a4dc438c27
Adam Lesinski [Wed, 17 Aug 2016 21:51:13 +0000 (21:51 +0000)]
AAPT: Handle gaps in resources when building splits
am:
26ae640c34
Change-Id: Ieb081dbc7e451415c2ada4fb7ce18bbfc6ea0fba
TreeHugger Robot [Wed, 17 Aug 2016 21:45:59 +0000 (21:45 +0000)]
Merge "AAPT: Handle gaps in resources when building splits" into nyc-mr1-dev
Tyler Gunn [Wed, 17 Aug 2016 21:23:38 +0000 (21:23 +0000)]
Merge "Add Telephony Connection event for handover from WIFI to LTE." into nyc-mr1-dev
am:
36863797cd
Change-Id: I14c02ea467928e54191142fd84d58e0be8a5e84f
Tyler Gunn [Wed, 17 Aug 2016 21:23:32 +0000 (21:23 +0000)]
Add Telephony Connection event for handover from WIFI to LTE.
am:
481255dc1c
Change-Id: I52676d0814db22cf9d6673e31aa7a71cdf155e81
Tyler Gunn [Wed, 17 Aug 2016 21:19:41 +0000 (21:19 +0000)]
Merge "Add Telephony Connection event for handover from WIFI to LTE." into nyc-mr1-dev
Phil Weaver [Wed, 17 Aug 2016 20:56:05 +0000 (20:56 +0000)]
Merge "Restart accessibility services after they update." into nyc-mr1-dev
am:
ee4ff424ea
Change-Id: I08cbe3ccb4a8b53ec2804ee51a01ad4a7a205eb3
Phil Weaver [Wed, 17 Aug 2016 20:56:02 +0000 (20:56 +0000)]
Restart accessibility services after they update.
am:
1e6695bbd4
Change-Id: I10714ce8ebc0b9ca6dd206a4a11e283704d668ae
Phil Weaver [Wed, 17 Aug 2016 20:52:04 +0000 (20:52 +0000)]
Merge "Restart accessibility services after they update." into nyc-mr1-dev
Tyler Gunn [Wed, 17 Aug 2016 20:48:27 +0000 (13:48 -0700)]
Add connection events for indicated when a connection is remotely held.
Note: This is different than the existing EVENT_ON_HOLD_TONE_START
and EVENT_ON_HOLD_TONE_END events, which trigger playing a hold tone for
remotely held calls. Those events also take into account whether the call
is foreground/background; it is left as a future exercise to clean that
up.
Bug:
30349182
Change-Id: I919365d243ae3b9fe56454c7a2b9d5805b2c03a2
Alan Viverette [Wed, 17 Aug 2016 20:20:28 +0000 (20:20 +0000)]
Merge "Announce the date for accessibility using EMMMMdy format" into nyc-mr1-dev
am:
8ecc7f7303
Change-Id: I5e1124d7fabc432058447a8df9f09620931c4486
Alan Viverette [Wed, 17 Aug 2016 20:20:25 +0000 (20:20 +0000)]
Announce the date for accessibility using EMMMMdy format
am:
a770530e12
Change-Id: Ibe201d5ad5d65348578f6d0153b6cbb6e7bfa0d9
Alan Viverette [Wed, 17 Aug 2016 20:14:32 +0000 (20:14 +0000)]
Merge "Announce the date for accessibility using EMMMMdy format" into nyc-mr1-dev
Hemal Patel [Wed, 17 Aug 2016 19:55:35 +0000 (19:55 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd am:
00ff40145d
am:
97632afe5e
Change-Id: I2a8a6618a80923857d4f91ef2f6c79728a4b6672
Yohei Yukawa [Wed, 17 Aug 2016 19:54:14 +0000 (19:54 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev
am:
ca0ef33746
Change-Id: Id68955fa3127668b3403bb946ecb850f8e7a3d55
Adam Lesinski [Tue, 16 Aug 2016 01:45:00 +0000 (18:45 -0700)]
AAPT: Handle gaps in resources when building splits
Due to public ID assignment, gaps in resource type and entry
IDs can occur. This can lead to null pointer dereferencing
if not careful. This happened in ResourceTable::getDensityVaryingResources()
which is called when building Splits.
Bug:
30879690
Change-Id: I588e4dcd2e042fccfcb2e87967b5cbd0d23b4497
(cherry picked from commit
081d1b4cf602fdd7302b597e6bf902cb415bc3a8)
Yohei Yukawa [Wed, 17 Aug 2016 19:49:14 +0000 (19:49 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev
am:
4aa5325ba8
Change-Id: Ib7f69a0dafe92592a623970aeb72b54ff2826e63
Yohei Yukawa [Wed, 17 Aug 2016 19:49:01 +0000 (19:49 +0000)]
Make View#isTemporarilyDetached() less confusing
am:
ed841cbdd7
Change-Id: I2df97c1babb9fc515295c527a18d9f88546dfad7
Hemal Patel [Wed, 17 Aug 2016 19:45:03 +0000 (19:45 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs am:
c7902aa4bb
am:
5e086dc3bb
Change-Id: I68730df7e316e2bb9f58b7b9732a06222305bfea
OSDN Git Service
