OSDN Git Service
Christopher Tate [Thu, 13 Oct 2016 21:23:58 +0000 (21:23 +0000)]
Only full-data back up regular files + directories am:
da2018efeb am:
0d816b8f69
am:
86208efdc9
Change-Id: I3e39c52cf9895de9b893b7ec6c8d3287af7693b0
Adam Lesinski [Thu, 13 Oct 2016 21:22:24 +0000 (21:22 +0000)]
Merge "Move attribute resolution from core/jni to libandroidfw"
Greg Plesur [Thu, 13 Oct 2016 21:20:13 +0000 (21:20 +0000)]
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev am:
216ee1f0e7
am:
fd6399698a
Change-Id: Id4adc11488df2c0720697095658a2ebd91b8e990
Greg Plesur [Thu, 13 Oct 2016 21:19:17 +0000 (21:19 +0000)]
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade. am:
3514404984
am:
43ed3a5b6a
Change-Id: I20248c835034935c25ee6fa25f8eeeb9125f121e
Christopher Tate [Thu, 13 Oct 2016 21:17:09 +0000 (21:17 +0000)]
Only full-data back up regular files + directories am:
da2018efeb
am:
0d816b8f69
Change-Id: I3b28c373c58ebebf27b1297e770d2023767e6396
Christopher Tate [Thu, 13 Oct 2016 21:13:00 +0000 (21:13 +0000)]
Only full-data back up regular files + directories
am:
da2018efeb
Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073
Greg Plesur [Thu, 13 Oct 2016 21:12:56 +0000 (21:12 +0000)]
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
am:
216ee1f0e7
Change-Id: I585c709c3a8648e754779c71497d18a35b321bb7
Greg Plesur [Thu, 13 Oct 2016 21:12:51 +0000 (21:12 +0000)]
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade.
am:
3514404984
Change-Id: I8d24007831ba030af0d84f717802c79172db970f
Greg Plesur [Thu, 13 Oct 2016 21:01:59 +0000 (21:01 +0000)]
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
TreeHugger Robot [Thu, 13 Oct 2016 20:50:37 +0000 (20:50 +0000)]
Merge "Switch UM to internal isUserUnlockingOrUnlocked"
TreeHugger Robot [Thu, 13 Oct 2016 20:49:51 +0000 (20:49 +0000)]
Merge "Greatly reduce BenchmarkState overhead"
Dianne Hackborn [Thu, 13 Oct 2016 20:47:47 +0000 (20:47 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev am:
33e56a9e1f am:
d3ad5ce147
am:
7990701a14
Change-Id: Ib2f4c585628cb469975dbe41a85bfdcb52e58857
Dianne Hackborn [Thu, 13 Oct 2016 20:44:47 +0000 (20:44 +0000)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle am:
851ec49de7 am:
9774ea3646
am:
50468217c4
Change-Id: I949e6337546835a0673b85ee6e2ad67fb0a0fec4
Dianne Hackborn [Thu, 13 Oct 2016 20:41:01 +0000 (20:41 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev am:
33e56a9e1f
am:
d3ad5ce147
Change-Id: Ic097998a5fdbe47831934baf0f8bdebcfd622007
Dianne Hackborn [Thu, 13 Oct 2016 20:38:04 +0000 (20:38 +0000)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle am:
851ec49de7
am:
9774ea3646
Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
Dianne Hackborn [Thu, 13 Oct 2016 20:36:38 +0000 (20:36 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
am:
33e56a9e1f
Change-Id: I74c2a5391f8eebf0544447886b14714fbd0202b1
Dianne Hackborn [Thu, 13 Oct 2016 20:31:43 +0000 (20:31 +0000)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle
am:
851ec49de7
Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7
TreeHugger Robot [Thu, 13 Oct 2016 20:28:53 +0000 (20:28 +0000)]
Merge "Visualize view focus in debug mode."
Svetoslav Ganov [Thu, 13 Oct 2016 20:27:13 +0000 (20:27 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am:
cba436b312 am:
8d3fc0fd8a
am:
e8e50a81ad
Change-Id: I22d1f733fdab84f3d83076eb9dd36260d5a7d194
Svetoslav Ganov [Thu, 13 Oct 2016 20:26:19 +0000 (20:26 +0000)]
Allow SetupWizard to do WiFi scans if location off am:
b2457c3704 am:
ff484bbfeb
am:
ebdcd873ec
Change-Id: Id9cf89c6f4b6a505cb568a3b782f2c302cc5ae49
Dianne Hackborn [Thu, 13 Oct 2016 20:21:23 +0000 (20:21 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
Svetoslav Ganov [Thu, 13 Oct 2016 20:20:55 +0000 (20:20 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am:
cba436b312
am:
8d3fc0fd8a
Change-Id: I3002282020faf541fc37e1137a3c89d23b99f416
Svetoslav Ganov [Thu, 13 Oct 2016 20:19:45 +0000 (20:19 +0000)]
Allow SetupWizard to do WiFi scans if location off am:
b2457c3704
am:
ff484bbfeb
Change-Id: I7f6cda2da22347375507a0364e976bbb01066ccc
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:19 +0000 (20:15 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
am:
cba436b312
Change-Id: Iccde94bb855b3461ddb804b69182c439f9c07e1f
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:16 +0000 (20:15 +0000)]
Allow SetupWizard to do WiFi scans if location off
am:
b2457c3704
Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd
Svetoslav Ganov [Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
Kevin Hufnagle [Thu, 13 Oct 2016 19:36:11 +0000 (19:36 +0000)]
Merge "Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
f3d638b1d3" into nyc-mr1-dev-plus-aosp
am:
abbc2ec40b
Change-Id: I5be66e4c0ad9c194b840dcd075a8d00c525c0796
Kevin Hufnagle [Thu, 13 Oct 2016 19:36:04 +0000 (19:36 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
f3d638b1d3
am:
6e9ea6aef5
Change-Id: I1810be7b7ba2f6b39b90a63b57634ed9ff963dfb
Kevin Hufnagle [Thu, 13 Oct 2016 19:34:44 +0000 (19:34 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
906703d124" into nyc-mr1-dev-plus-aosp
am:
c101d1bd68
Change-Id: Ia1b1088ad27b4dfc11bf3937aa25bc71baf8ef51
Kevin Hufnagle [Thu, 13 Oct 2016 19:34:38 +0000 (19:34 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
906703d124
am:
e882dc02dd
Change-Id: I73164eacd83af25ef1af50a027628f35992b235e
Andrew Solovay [Thu, 13 Oct 2016 19:33:16 +0000 (19:33 +0000)]
Merge "docs: Changed Google Analytics link to https:// am:
374ddfe529 am:
b3fcc389d2" into nyc-mr1-dev-plus-aosp
am:
ec7800d970
Change-Id: Ief6992e395427aa9b988eb341fbd62cde986fe60
Andrew Solovay [Thu, 13 Oct 2016 19:33:10 +0000 (19:33 +0000)]
docs: Changed Google Analytics link to https:// am:
374ddfe529 am:
b3fcc389d2
am:
dfb4cf4637
Change-Id: Ibdcf96eabd53d79595e2ad9ae540ecf56ece374b
Joe Fernandez [Thu, 13 Oct 2016 19:31:29 +0000 (19:31 +0000)]
Merge "Merge "docs: Add Android developer written case studies" into nyc-dev am:
d2c5657e9c am:
e28b5e72af" into nyc-mr1-dev-plus-aosp
am:
12d33edbf2
Change-Id: I3c36f33f047505c2aa83864c56808af10807e2c7
Joe Fernandez [Thu, 13 Oct 2016 19:31:22 +0000 (19:31 +0000)]
Merge "docs: Add Android developer written case studies" into nyc-dev am:
d2c5657e9c am:
e28b5e72af
am:
ddba4478bf
Change-Id: I7295d6d314e12af2077edf9bf7cdf0146f898c3b
George French [Thu, 13 Oct 2016 19:29:57 +0000 (19:29 +0000)]
Merge "docs: Add Android developer written case studies am:
cf71b1fdc0 am:
22008c24ed" into nyc-mr1-dev-plus-aosp
am:
420f73e0ab
Change-Id: I5eff7f20a7d4eec8a8fff937a1d9a5d1fc5211c5
George French [Thu, 13 Oct 2016 19:29:52 +0000 (19:29 +0000)]
docs: Add Android developer written case studies am:
cf71b1fdc0 am:
22008c24ed
am:
266933234a
Change-Id: I75bc3da4efe93ffea51e9aeaaa5c291b425ff1c4
Chris Tate [Thu, 13 Oct 2016 19:28:39 +0000 (19:28 +0000)]
Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am:
4bd56fbbee am:
622e97ffaf" into nyc-mr1-dev-plus-aosp
am:
f051de84d5
Change-Id: I725f1a9c287f5c3eeb51e5ae7eb4607d9ca177ed
Chris Tate [Thu, 13 Oct 2016 19:28:34 +0000 (19:28 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am:
4bd56fbbee am:
622e97ffaf
am:
9f65c6d017
Change-Id: I16df45f469693e0103c2c222bd93b9f5c0d7958b
Joe Fernandez [Thu, 13 Oct 2016 19:27:38 +0000 (19:27 +0000)]
Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev am:
cae752e66b am:
c923831485
am:
490a707129
Change-Id: I76dc6c72e3e6f69957ed2c605977e6af13337dcb
Christopher Tate [Thu, 13 Oct 2016 19:24:50 +0000 (19:24 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am:
edd8dc83d5 am:
4cb8e2de6f" into nyc-mr1-dev-plus-aosp
am:
d344b407df
Change-Id: Ie75c36576a821c7faa720bfae54d47b5e5560f85
Christopher Tate [Thu, 13 Oct 2016 19:24:45 +0000 (19:24 +0000)]
Retain allowBackup annotation when system+lock wallpaper becomes lock only am:
edd8dc83d5 am:
4cb8e2de6f
am:
8371d28717
Change-Id: I13cbbeabab75413ab66b5c64f021ccba2330d830
George French [Thu, 13 Oct 2016 19:23:53 +0000 (19:23 +0000)]
Docs: Developer written case studies batch 3 (proj 31) am:
26ab4135ab am:
7fc349d57b
am:
ba297baa04
Change-Id: I7dff365b3d143380bf8c4e409d4c127db1ed67bb
Kevin Hufnagle [Thu, 13 Oct 2016 19:22:53 +0000 (19:22 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev am:
aa78ed5b0a am:
6c6080c184
am:
b64a060326
Change-Id: I70cf4dc9efcf097450fa63bd75cb531019943d76
Kevin Hufnagle [Thu, 13 Oct 2016 19:22:03 +0000 (19:22 +0000)]
docs: Revised Espresso code snippets am:
d3c3c34134 am:
73b8852c9e
am:
8aeef83962
Change-Id: I12d71d630938ef887eb90669f84286f87db9ab05
Android Build Merger (Role) [Thu, 13 Oct 2016 19:21:32 +0000 (19:21 +0000)]
Merge "Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
f3d638b1d3" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Thu, 13 Oct 2016 19:21:10 +0000 (19:21 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev am:
8e4ea67fa7 am:
df40339d4b
am:
c9aa1bd530
Change-Id: I32f955a4ded52780d839b0f8eb8fa648c45e383f
Kevin Hufnagle [Thu, 13 Oct 2016 19:20:48 +0000 (19:20 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120
am:
f3d638b1d3
Change-Id: I1613de506cb28ae1bb0e24afce1f9262e780332d
Android Build Merger (Role) [Thu, 13 Oct 2016 19:20:29 +0000 (19:20 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
906703d124" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Thu, 13 Oct 2016 19:20:09 +0000 (19:20 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB. am:
197226e4a5 am:
ccde6c9c5e
am:
847db9ed1d
Change-Id: If5cc0985fd7fd92aca74526a67b41e9a581b87e4
Kevin Hufnagle [Thu, 13 Oct 2016 19:19:55 +0000 (19:19 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5
am:
906703d124
Change-Id: I4bc463517602130e36d6ff126f7387214073f4cc
Christopher Tate [Thu, 13 Oct 2016 19:12:29 +0000 (12:12 -0700)]
Only full-data back up regular files + directories
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.
Bug
32143362
Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
Android Build Merger (Role) [Thu, 13 Oct 2016 19:19:38 +0000 (19:19 +0000)]
Merge "docs: Changed Google Analytics link to https:// am:
374ddfe529 am:
b3fcc389d2" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Thu, 13 Oct 2016 19:18:57 +0000 (19:18 +0000)]
docs: Changed Google Analytics link to https:// am:
374ddfe529
am:
b3fcc389d2
Change-Id: Ib2514a3735156498573e84daaba68fe2dfcd49ce
Android Build Merger (Role) [Thu, 13 Oct 2016 19:18:40 +0000 (19:18 +0000)]
Merge "Merge "docs: Add Android developer written case studies" into nyc-dev am:
d2c5657e9c am:
e28b5e72af" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Thu, 13 Oct 2016 19:18:08 +0000 (19:18 +0000)]
Merge "docs: Add Android developer written case studies" into nyc-dev am:
d2c5657e9c
am:
e28b5e72af
Change-Id: I0f92c59eabacfce3f8b206fcda8ceac143bfc1e4
Android Build Merger (Role) [Thu, 13 Oct 2016 19:17:51 +0000 (19:17 +0000)]
Merge "docs: Add Android developer written case studies am:
cf71b1fdc0 am:
22008c24ed" into nyc-mr1-dev-plus-aosp
George French [Thu, 13 Oct 2016 19:17:22 +0000 (19:17 +0000)]
docs: Add Android developer written case studies am:
cf71b1fdc0
am:
22008c24ed
Change-Id: I12ec64b7e0362728eca32ca61795e65904cc9b74
Android Build Merger (Role) [Thu, 13 Oct 2016 19:17:20 +0000 (19:17 +0000)]
Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am:
4bd56fbbee am:
622e97ffaf" into nyc-mr1-dev-plus-aosp
Chris Tate [Thu, 13 Oct 2016 19:16:47 +0000 (19:16 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am:
4bd56fbbee
am:
622e97ffaf
Change-Id: I5ebed04800d3acf758787067b63bca50fa957649
Joe Fernandez [Thu, 13 Oct 2016 19:16:35 +0000 (19:16 +0000)]
Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev am:
cae752e66b
am:
c923831485
Change-Id: Icc9e5f1076d73f5a4701f28af60fafa99f80fa72
Bert McMeen [Thu, 13 Oct 2016 19:15:19 +0000 (19:15 +0000)]
Docs: Remove a reference to a deprecated sample am:
3e01ab2b0e am:
33b31ee73a
am:
f871452817
Change-Id: I2d402095660c88268c276d2b82e85631e18196b5
Tobias Sargeant [Thu, 13 Oct 2016 19:14:28 +0000 (19:14 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master am:
38bfbf8d2a am:
6fd39c5cd5
am:
8959832d40
Change-Id: Ia5ad4cc3b36578fe250f96d8b960bd10d7cf9d6a
Android Build Merger (Role) [Thu, 13 Oct 2016 19:14:06 +0000 (19:14 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am:
edd8dc83d5 am:
4cb8e2de6f" into nyc-mr1-dev-plus-aosp
Christopher Tate [Thu, 13 Oct 2016 19:13:33 +0000 (19:13 +0000)]
Retain allowBackup annotation when system+lock wallpaper becomes lock only am:
edd8dc83d5
am:
4cb8e2de6f
Change-Id: Ic4309ab74a5e9ce4893e582541e84f5160bf9d2f
George French [Thu, 13 Oct 2016 19:11:14 +0000 (19:11 +0000)]
Docs: Developer written case studies batch 3 (proj 31) am:
26ab4135ab
am:
7fc349d57b
Change-Id: Iad31d60815af6eb6d4a3b0b4f31ed38632386292
Kevin Hufnagle [Thu, 13 Oct 2016 19:10:18 +0000 (19:10 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev am:
aa78ed5b0a
am:
6c6080c184
Change-Id: I49963b9f7415dfcb05132c5cb9d8fa4b2231b53f
Kevin Hufnagle [Thu, 13 Oct 2016 19:08:31 +0000 (19:08 +0000)]
docs: Revised Espresso code snippets am:
d3c3c34134
am:
73b8852c9e
Change-Id: Ifee2334b45b5d387a4eccc3840260fadad4325ea
Greg Plesur [Mon, 10 Oct 2016 20:23:49 +0000 (16:23 -0400)]
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.
BUG:
32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
Kevin Hufnagle [Thu, 13 Oct 2016 19:07:37 +0000 (19:07 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev am:
8e4ea67fa7
am:
df40339d4b
Change-Id: I992165e933fa868d26078015a860c3b8efcc5594
Kevin Hufnagle [Thu, 13 Oct 2016 19:06:39 +0000 (19:06 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB. am:
197226e4a5
am:
ccde6c9c5e
Change-Id: Ib4394208cc8ddbadb398ff16eca4df302e759b20
Bert McMeen [Thu, 13 Oct 2016 19:05:49 +0000 (19:05 +0000)]
Docs: Remove a reference to a deprecated sample am:
3e01ab2b0e
am:
33b31ee73a
Change-Id: Ib4506eeefc13b4e207e8806cbb30846a647f4b78
Robert Sesek [Thu, 13 Oct 2016 19:04:56 +0000 (19:04 +0000)]
Merge "resolve merge conflicts of
7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am:
f43d5b36d6
Change-Id: I3c6751438f3037a1471acbf1065703985e24a200
Robert Sesek [Thu, 13 Oct 2016 19:04:51 +0000 (19:04 +0000)]
resolve merge conflicts of
7031dac to nyc-mr1-dev-plus-aosp
am:
d414158f79
Change-Id: I213355bfb398d6a07aa823338c479a26ed597a59
Chris Tate [Thu, 13 Oct 2016 19:04:43 +0000 (19:04 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
am:
4bd56fbbee
Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe
Christopher Tate [Thu, 13 Oct 2016 19:04:40 +0000 (19:04 +0000)]
Retain allowBackup annotation when system+lock wallpaper becomes lock only
am:
edd8dc83d5
Change-Id: I2f3a6587bb7f53517232cf051a345e2c617b3778
Tobias Sargeant [Thu, 13 Oct 2016 19:04:39 +0000 (19:04 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master am:
38bfbf8d2a
am:
6fd39c5cd5
Change-Id: Ie04786fe95b99a92a7dc0366e8847168372baa76
Robert Sesek [Thu, 13 Oct 2016 18:55:34 +0000 (18:55 +0000)]
Merge "resolve merge conflicts of
7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Chris Tate [Thu, 13 Oct 2016 18:51:10 +0000 (18:51 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 13 Oct 2016 18:29:30 +0000 (18:29 +0000)]
Merge "Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
58425dc58d am:
669537a9fe am:
0a3270642c am:
4480f347f8"
Vladislav Kaznacheev [Thu, 13 Oct 2016 18:29:16 +0000 (18:29 +0000)]
Merge "Avoid sending incorrect or redundant hover events."
Bert McMeen [Thu, 13 Oct 2016 18:28:36 +0000 (18:28 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
58425dc58d am:
669537a9fe am:
0a3270642c
am:
4480f347f8
Change-Id: Idc884d7d09cec5aa4df3996560d6fb581dd3ae34
Bert McMeen [Thu, 13 Oct 2016 18:16:04 +0000 (18:16 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
58425dc58d am:
669537a9fe
am:
0a3270642c
Change-Id: I5954b87d81b8127cf8a071d51473481770d84061
TreeHugger Robot [Thu, 13 Oct 2016 18:10:33 +0000 (18:10 +0000)]
Merge "Implemented a PriorityDump helper."
Bert McMeen [Thu, 13 Oct 2016 18:03:31 +0000 (18:03 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
58425dc58d
am:
669537a9fe
Change-Id: Ie8e8b14c46ccfda8824dccfdbf2dc3029661ad0b
Bert McMeen [Thu, 13 Oct 2016 17:50:57 +0000 (17:50 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e
am:
58425dc58d
Change-Id: Icf36fd2b6c4b2489a7197d32392c4a6382a934c3
Makoto Onuki [Thu, 13 Oct 2016 17:49:14 +0000 (17:49 +0000)]
Merge "Pass client package name to GAL providers (framework)"
Bert McMeen [Thu, 13 Oct 2016 17:38:59 +0000 (17:38 +0000)]
Docs: Updates to the Download/Test file related to watch setup
am:
137c545e4e
Change-Id: Ic605d9d26c60e3dd01cd4a9993a6d50d5cfdd94c
Fyodor Kupolov [Fri, 7 Oct 2016 00:11:14 +0000 (17:11 -0700)]
Switch UM to internal isUserUnlockingOrUnlocked
Internal version of UMS maintains a self-locking data-structure of user
states that is pushed from ActivityManager. Previously there could
be discrepancies between UMS.isUserUnlockingOrUnlocked and
UM.isUserUnlockingOrUnlocked, which is calling a blocking version
in ActivityManager.
Test: manual + UserManagerTests
Bug:
31995235
Bug:
31833240
Change-Id: Ibafe403f57cd32d9052bb55fe7273a861be1d037
TreeHugger Robot [Thu, 13 Oct 2016 17:06:34 +0000 (17:06 +0000)]
Merge "Fix restore of notification preferences."
Derek Sollenberger [Thu, 13 Oct 2016 16:53:11 +0000 (16:53 +0000)]
Merge "Initial refactoring to enable the addition of the SkiaOpenGLPipeline."
Chris Craik [Thu, 13 Oct 2016 16:45:47 +0000 (16:45 +0000)]
Merge "Add SlowNestedRecyclerViewActivity"
Felipe Leme [Sat, 8 Oct 2016 00:57:13 +0000 (17:57 -0700)]
Implemented a PriorityDump helper.
dumpsys / dumpstate will soon dump services in buckets (CRITICAL, HIGH,
NORMAL) and services must check the --dump_priority argument to select
which sections to dump.
PriorityDump parses the args checking for that argument, making it
easier to implement bucket dumping.
BUG:
27429130
Test: com.android.server.utils.PriorityDumpTest passes
Change-Id: Ia5ee08a3dc5bd0fde80b8a5616e1311e1b3bf7ba
John Reck [Wed, 12 Oct 2016 22:27:52 +0000 (15:27 -0700)]
Greatly reduce BenchmarkState overhead
CL reduces BenchmarkState to minimal levels. It also adds
a warmup loop to get things going first before starting measurements.
With this change with clocks /not/ locked on bullhead the test for
RenderNodeJniOverhead is showing a stable (0ns std dev) result
of 54ns, which is approximately the expected amount.
Test: Ran a few perf benchmarks
Change-Id: If01e455884711ebd9cfb89f076efa19dc0b5436d
Julia Reynolds [Thu, 13 Oct 2016 15:02:10 +0000 (11:02 -0400)]
Fix restore of notification preferences.
Test: change prefs on package a. trigger a local backup.
uninstall the app. trigger a restore. install the app. verify
that its preferences are restored in settings.
Bug:
31514485
Change-Id: I1d8a9b52c996d326aee650110e31fe80907703a7
Vladislav Kuzkokov [Thu, 13 Oct 2016 13:31:56 +0000 (13:31 +0000)]
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev am:
b24489e20a am:
d469c4e8b6
am:
69b6f159d7
Change-Id: I14af2d3d5c4b5e87990136a0625778e5fb367454
TreeHugger Robot [Thu, 13 Oct 2016 13:30:52 +0000 (13:30 +0000)]
Merge "resolve merge conflicts of
792e051 to master"
Vladislav Kuzkokov [Thu, 13 Oct 2016 10:42:59 +0000 (12:42 +0200)]
resolve merge conflicts of
792e051 to master
Change-Id: I75e604639959df77ddf11bbb9805392e4141da23
Jorim Jaggi [Wed, 12 Oct 2016 12:25:02 +0000 (14:25 +0200)]
Don't output latency if it wasn't started
Test: Make sure you don't get double latency output for a single
action.
Fixes:
32085767
Change-Id: I7f57f974737ce21e8513688a8d5fbf80a1f0571b
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:49:23 +0000 (08:49 +0000)]
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev am:
b24489e20a
am:
d469c4e8b6
Change-Id: I79bfb43f89e1d345731cc7abcf534fe65db596c0
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:48:31 +0000 (08:48 +0000)]
Revert "Fix backup for users hit by erroneous backup disabling" am:
9f61d17e6a
am:
98a145b5af
Change-Id: I82ae89b2b0ebb5fefd44fec4f10184b6bb7123d3
OSDN Git Service
