Commit Graph

253133 Commits

Author SHA1 Message Date
Vladislav Kuzkokov
cd339f211a Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev 2016-09-28 21:15:09 +00:00
Vladislav Kuzkokov
a7d26d9171 Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev 2016-09-28 21:14:48 +00:00
Kevin Hufnagle
d36471009a Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev am: de85f4d045
am: 9c2b6aceb8

Change-Id: I949c7403b034d9a331e1b579f20ff3e45ebaf2d9
2016-09-28 20:29:31 +00:00
Kevin Hufnagle
511f442c41 docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page. am: b960272cc4
am: ca45197735

Change-Id: I01039b1fb34e2f5041ef80ad372f25dba73bf552
2016-09-28 20:28:39 +00:00
Kevin Hufnagle
69231463ab Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev am: cc717cdb01
am: f3f0edd59f

Change-Id: I94c74357fead76956c55f6479fecf49db52b6f21
2016-09-28 20:22:35 +00:00
Kevin Hufnagle
7d8018e0d5 docs: Fixed constants in manifest sample related to battery level. am: d00481bef2
am: 8d12a2a1c9

Change-Id: Ic14678197693a1b8997a999b626784845c25127c
2016-09-28 20:21:45 +00:00
Kevin Hufnagle
9c2b6aceb8 Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev
am: de85f4d045

Change-Id: Ib58c5bc8c6e74ae184ab448d0aad7176d11d0932
2016-09-28 20:17:11 +00:00
Kevin Hufnagle
ca45197735 docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page.
am: b960272cc4

Change-Id: I9fbc8c06dfd2c8aed47a0d84f73b48c50be205c0
2016-09-28 20:17:08 +00:00
Kevin Hufnagle
f3f0edd59f Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev
am: cc717cdb01

Change-Id: I9a90c173581e6058cd3d883f17f2b2d8aa72c4b8
2016-09-28 20:15:48 +00:00
Kevin Hufnagle
8d12a2a1c9 docs: Fixed constants in manifest sample related to battery level.
am: d00481bef2

Change-Id: I66559bea4c416170893587a737913b42197079c9
2016-09-28 20:15:45 +00:00
Kevin Hufnagle
de85f4d045 Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev 2016-09-28 20:09:59 +00:00
Kevin Hufnagle
cc717cdb01 Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev 2016-09-28 20:09:31 +00:00
TreeHugger Robot
7c9aaa6ef6 Merge "Force APKs to be streamed" into nyc-mr1-dev 2016-09-28 20:06:20 +00:00
Vladislav Kuzkokov
1975021d88 Fix backup for users hit by erroneous backup disabling
BUG=31754835

Change-Id: I89dd08b7958dd8fe20d70bc50f2c89996ae46cc5
2016-09-28 21:31:16 +02:00
TreeHugger Robot
e7809891f7 Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev 2016-09-28 19:07:20 +00:00
Vladislav Kuzkokov
bbaadc0166 Fix logic in disabling BackupTransport in DO mode.
We were disabling backup in consumer mode as well.

BUG=31754835
TEST=android.content.pm.cts.shortcuthost.ShortcutManagerBackupTest

Change-Id: I42e5cfa512fda1b471eb62c7eb8bc346383da2fa
2016-09-28 20:24:42 +02:00
TreeHugger Robot
0f53f6ffa2 Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev 2016-09-28 15:46:32 +00:00
Jeremy Klein
adc26ec1b4 Remove unused mContext from BluetoothGatt[Server].
All that this member variable is doing right now is leaking a
reference to a context without any benefit.

Bug: 31752040
Bug: 31710795
Change-Id: If2241422533318b866340e8dcc9f5fbd9518349c
2016-09-28 07:09:38 +00:00
Erik Kline
c3eec4fff9 Support triggering confirmConfiguration() via dumpsys
Tested:
  - flashed to device
  - triggered
  - monitored tcpdump for the expected traffic

Bug: 30869013
Change-Id: I6a4741bdeed2aaa483f8c2281acb74d245a323e8
2016-09-28 15:19:00 +09:00
Sungsoo
4e236046ae ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 0a31d58d14

Change-Id: I33726dd0a1bf2f30309e4abd74b8633c809afada
2016-09-28 00:22:55 +00:00
Vadim Tryshev
aed92d0547 Fixing html glitch in drag/drop docs.
Bug: 31702571
Change-Id: Id00baac3c9c16f6dc7145a920ec9659d63ebab2a
2016-09-27 17:17:07 -07:00
Sungsoo
0a31d58d14 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I4df5b4855ec9f1e38fab504f3a895c4744cc287e
2016-09-28 00:15:51 +00:00
Sungsoo
d0a8a69034 ExifInterface: Update javadoc for saveAttributes
am: abf5b4cbf3

Change-Id: Icdd289f513f2a576b50d0f3ddf278a1c1710d8b5
2016-09-28 00:08:52 +00:00
TreeHugger Robot
c43f05e669 Merge "Changed themes for core activities" into nyc-mr1-dev 2016-09-28 00:04:00 +00:00
Greg Kaiser
a97c9617ae Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev 2016-09-27 23:41:44 +00:00
TreeHugger Robot
121a9941d4 Merge "Don't leak wakelock instances" into nyc-mr1-dev 2016-09-27 23:37:57 +00:00
Andrew Solovay
97c0ad4401 Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f
am: 6789896f2d

Change-Id: I9f87882ff67784285225db361e24739ed3b5d509
2016-09-27 23:03:09 +00:00
Andrew Solovay
34c0653b22 docs: Removed support libraries from API Guide TOC am: 61f956cc25
am: 06c6d90437

Change-Id: Ie6d17de7ecd7f3a41814afb391d61be1a265f962
2016-09-27 23:02:17 +00:00
Andrew Solovay
6789896f2d Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev
am: c7c7c20b2f

Change-Id: I2e081c2183087e25f1c722ab4717a89da84bd9dd
2016-09-27 22:57:52 +00:00
Andrew Solovay
06c6d90437 docs: Removed support libraries from API Guide TOC
am: 61f956cc25

Change-Id: I1d8ccea474531a3ce4dcaa7d261f3cff62cf4302
2016-09-27 22:57:49 +00:00
Andrew Solovay
c7c7c20b2f Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev 2016-09-27 22:52:31 +00:00
Greg Kaiser
1983f9b05b ContextHubService: Hack around 32-bit app ID
The NanoApp.java class has a bug (b/30808791) where the API treats
app IDs as 32-bits, instead of 64-bits.  We are too late in the
Android N release cycle to change this API.

We previously put in a hack to fix this only for Google nanoapps.
However, our GTS nanoapps need this to work, and there are other
partners who need this to work in the N timeframe.  So we make
a more robust hack which parses the full 64-bit app ID out of
the header binary.

Test: Compiles and runs GTS
Bug: 31767599
Change-Id: Ic43f1f62c685fb99aac08d08767d1a67c329503f
2016-09-27 15:01:48 -07:00
Christopher Tate
4b17e984b6 Don't leak wakelock instances
Bug 31247436

Change-Id: I7c2ad956c43233b37e53856e9321cb87b01c35da
2016-09-27 15:00:48 -07:00
Eric Schmidt
d5aa6361d9 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10
am: 6c7544b97a

Change-Id: Ib96fa46b29b30274956180734f4499458a05a906
2016-09-27 21:59:45 +00:00
Eric Schmidt
561a946aa8 docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532
am: defb8bdaea

Change-Id: I50dd95ac7263b4af2b5f9482b8b2de18ceda5a5e
2016-09-27 21:58:52 +00:00
Eric Schmidt
03a34bc741 Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev am: f4dbb4091b
am: 168ea4e12c

Change-Id: I758356a9a6ddf09863dd02273e571cdff8c05c98
2016-09-27 21:57:58 +00:00
Eric Schmidt
e8100dbfd9 docs: Adding Espresso Intent and Web docs am: 34fb906c1a
am: 0bb23eecef

Change-Id: I86911914d287541496228d639fb7040e3ec63e80
2016-09-27 21:57:10 +00:00
Eric Schmidt
6c7544b97a Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev
am: d780260f10

Change-Id: Ia7358c8ca2f7afcff130e275d79ae45f3e37e411
2016-09-27 21:51:37 +00:00
Eric Schmidt
defb8bdaea docs: Update BroadcastReceiver docs for performance
am: 8cf3c1b532

Change-Id: I7781c542c7512bb178ba23c7421b47d7d1be8b09
2016-09-27 21:51:34 +00:00
Eric Schmidt
168ea4e12c Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev
am: f4dbb4091b

Change-Id: Ib807c964b623ff8e968b723990d7e6eb2e969569
2016-09-27 21:50:15 +00:00
Eric Schmidt
0bb23eecef docs: Adding Espresso Intent and Web docs
am: 34fb906c1a

Change-Id: Ie6a2d5e868f76b9959a6fbe3e0a151c44d132b02
2016-09-27 21:50:12 +00:00
Eric Schmidt
d780260f10 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev 2016-09-27 21:42:06 +00:00
Eric Schmidt
f4dbb4091b Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev 2016-09-27 21:41:43 +00:00
TreeHugger Robot
5c07d0c2ee Merge "[DO NOT MERGE] Use tokens instead of account access trackers" into nyc-mr1-dev 2016-09-27 20:45:48 +00:00
Andrew Solovay
f52c849083 Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am: 156d5fd88e
am: af089036be

Change-Id: Ie457b30f25fed45232f044206e5fe356ad6e6cfc
2016-09-27 20:45:00 +00:00
Andrew Solovay
61212ec382 docs: Redirect for /preview/setup-sdk.html am: 572d710ba3
am: a56c8c79d8

Change-Id: Id966ed24a5aa6cf3a7dc7f30a6c49a559cbb39ca
2016-09-27 20:44:06 +00:00
Andrew Solovay
af089036be Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev
am: 156d5fd88e

Change-Id: I86e1d6be64864a21ac27cd321633691541c447b6
2016-09-27 20:39:09 +00:00
Andrew Solovay
a56c8c79d8 docs: Redirect for /preview/setup-sdk.html
am: 572d710ba3

Change-Id: I5cbe45b1c45001f7f3a68565430dea060a0e1741
2016-09-27 20:39:07 +00:00
Andrew Solovay
156d5fd88e Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev 2016-09-27 20:31:49 +00:00
Eric Schmidt
34fb906c1a docs: Adding Espresso Intent and Web docs
Bug: 20721203
Bug: 20720633
bug: 27453733
Change-Id: I67a7d09a6652e3463728691f2a1f5679e900e776
2016-09-27 13:19:43 -07:00