OSDN Git Service
Amith Yamasani [Wed, 18 May 2016 20:57:10 +0000 (20:57 +0000)]
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
Chenjie Luo [Wed, 18 May 2016 20:41:10 +0000 (20:41 +0000)]
Add null pointer check in removeConnection am:
e370b538eb am:
58642e6545
am:
7e745ec49c
* commit '
7e745ec49c0458f92af65bf370770417dcc7075d':
Add null pointer check in removeConnection
Change-Id: Iba29d78be4b3cae05144e6c0b68cce5357114ddd
Chenjie Luo [Wed, 18 May 2016 20:35:51 +0000 (20:35 +0000)]
Add null pointer check in removeConnection am:
e370b538eb
am:
58642e6545
* commit '
58642e65455ee9456993a2f6386402fbcec68ab8':
Add null pointer check in removeConnection
Change-Id: Ia4d14a664c9869d1065313db6795ac4e72dee59d
Chenjie Luo [Wed, 18 May 2016 20:29:17 +0000 (20:29 +0000)]
Add null pointer check in removeConnection
am:
e370b538eb
* commit '
e370b538ebb6ca1072f270aee3003faaa0d1deb2':
Add null pointer check in removeConnection
Change-Id: I7b615a8f7c7a89617c4f748ad74007ec73db6784
Android Build Merger (Role) [Wed, 18 May 2016 20:22:37 +0000 (20:22 +0000)]
Merge "Merge "Fix a deadlock in system server" into nyc-dev am:
ab0744344d" into nyc-mr1-dev
Tyler Gunn [Wed, 18 May 2016 20:22:06 +0000 (20:22 +0000)]
Merge "Continued multi-endpoint work." into nyc-mr1-dev
Amith Yamasani [Wed, 18 May 2016 20:22:07 +0000 (20:22 +0000)]
Merge "Fix a deadlock in system server" into nyc-dev
am:
ab0744344d
* commit '
ab0744344db3e626f1a249f285289b66653cf6bb':
Fix a deadlock in system server
Change-Id: Ib223cf25d4ac53225e9e8791bdae497956dc8471
Svet Ganov [Wed, 18 May 2016 20:16:33 +0000 (20:16 +0000)]
Merge "Hide ephemeral API" into nyc-dev
am:
68c2919f70
* commit '
68c2919f70299352ae649e1d7a05e9431f8b7aa0':
Hide ephemeral API
Change-Id: I033dcf9e551cf3a110aea0b3493e3cdad9a38d80
TreeHugger Robot [Wed, 18 May 2016 20:12:26 +0000 (20:12 +0000)]
Merge "Fix a deadlock in system server" into nyc-dev
Svetoslav Ganov [Wed, 18 May 2016 20:10:27 +0000 (20:10 +0000)]
Merge "Hide ephemeral API" into nyc-dev
sreevanis [Wed, 18 May 2016 19:58:08 +0000 (19:58 +0000)]
Merge "Updated link to material design page." into mnc-io-docs am:
26aea1383a am:
890101ccb3
am:
625f97ba3b
* commit '
625f97ba3b4b0da653bf9da3a8336431f7b4f50e':
Updated link to material design page.
Change-Id: I4f295c8b35d7a7093ef48c58428ce43b27dd2502
Eric Schmidt [Wed, 18 May 2016 19:58:02 +0000 (19:58 +0000)]
docs: Fix to nav, added _book.yaml am:
584c09929e am:
6856d6f0b7
am:
adcb712154
* commit '
adcb712154de2c886e26795939ccb84730880035':
docs: Fix to nav, added _book.yaml
Change-Id: Icae143da127c4ead977478b6d0a1b99ebfb7dd7b
Joe Fernandez [Wed, 18 May 2016 19:50:39 +0000 (19:50 +0000)]
Merge "Updated link to material design page." into mnc-io-docs am:
26aea1383a
am:
890101ccb3
* commit '
890101ccb338fe0633b07f0197fe5c9957a4870d':
Updated link to material design page.
Change-Id: I6d88350c3f4681fa998c514e88532fe117c304dd
Eric Schmidt [Wed, 18 May 2016 19:50:34 +0000 (19:50 +0000)]
docs: Fix to nav, added _book.yaml am:
584c09929e
am:
6856d6f0b7
* commit '
6856d6f0b76527c75c5147c392f1bb10d5f121fb':
docs: Fix to nav, added _book.yaml
Change-Id: Ib3843b9ab63076cac75aea6517027de634a361a8
Philip P. Moltmann [Wed, 18 May 2016 19:50:30 +0000 (19:50 +0000)]
Merge "Declare no print services if 0 print services are enabled." into nyc-dev
am:
b852d0138a
* commit '
b852d0138ab84817b042791e0e204459d87038ce':
Declare no print services if 0 print services are enabled.
Change-Id: Id6a97654dcc889d0fe73e10210e649cb62c0861b
Philip P. Moltmann [Wed, 18 May 2016 19:45:04 +0000 (19:45 +0000)]
Merge "Declare no print services if 0 print services are enabled." into nyc-dev
sreevanis [Wed, 18 May 2016 19:43:01 +0000 (19:43 +0000)]
Merge "Updated link to material design page." into mnc-io-docs
am:
26aea1383a
* commit '
26aea1383afcaef13cedd5792088d3a3d6859f44':
Updated link to material design page.
Change-Id: Ia3e66198caff48e12fa03f471ecf80cb9bb4901e
Eric Schmidt [Wed, 18 May 2016 19:42:58 +0000 (19:42 +0000)]
docs: Fix to nav, added _book.yaml
am:
584c09929e
* commit '
584c09929e9536cdcafe44a7ea62c83c2b32ad31':
docs: Fix to nav, added _book.yaml
Change-Id: I917c4324aa10a6e471990db9c364a6f3f42d9d66
Joe Fernandez [Wed, 18 May 2016 19:38:17 +0000 (19:38 +0000)]
Merge "Updated link to material design page." into mnc-io-docs
Jorim Jaggi [Wed, 18 May 2016 19:34:26 +0000 (19:34 +0000)]
Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev
am:
96b2fe6a4e
* commit '
96b2fe6a4eec82635f39c025ee9c57e99207a3df':
Fix a few issues with ime adjust/minimized dock stack
Change-Id: I29e2d748e77f7773d7fc45440c1f807b25389ac5
Eric Schmidt [Wed, 18 May 2016 19:34:24 +0000 (19:34 +0000)]
Merge "docs: Updates to GIFs on WH home page" into mnc-io-docs am:
5ca058d38e am:
ef033cd807
am:
ea65985513
* commit '
ea659855131e1ee506793813e97532f6fdbd4294':
docs: Updates to GIFs on WH home page
Change-Id: Ib0f1594f841de2bf0b18fdd8ce8c10c0ca19f3bf
Eric Schmidt [Wed, 18 May 2016 19:30:34 +0000 (12:30 -0700)]
docs: Fix to nav, added _book.yaml
Bug:
28317418
Change-Id: I7f05376348ffec14d0173d4d0477f8571527297d
Jorim Jaggi [Wed, 18 May 2016 19:30:15 +0000 (19:30 +0000)]
Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev
sreevanis [Wed, 18 May 2016 19:28:18 +0000 (12:28 -0700)]
Updated link to material design page.
Bug:
28839753
Change-Id: Ib35d2cd097057db2b83e57d9cae35427f831f727
Eric Schmidt [Wed, 18 May 2016 19:28:52 +0000 (19:28 +0000)]
Merge "docs: Updates to GIFs on WH home page" into mnc-io-docs am:
5ca058d38e
am:
ef033cd807
* commit '
ef033cd807e23643b160bcb2152ba36eb3b8a2ed':
docs: Updates to GIFs on WH home page
Change-Id: I13a20a619f9adf79901306585e2e17e28f6ebe84
Christopher Tate [Wed, 18 May 2016 19:28:24 +0000 (19:28 +0000)]
Explicitly close pipe end when we cease operations...
am:
3bed1c0ef8
* commit '
3bed1c0ef8a66c4ce064b1c6ee443681070c5fcb':
Explicitly close pipe end when we cease operations...
Change-Id: Iefb271ac59812bee8e271bbfe6fc73fcd60c4581
Jorim Jaggi [Tue, 17 May 2016 23:41:32 +0000 (16:41 -0700)]
Fix a few issues with ime adjust/minimized dock stack
- Do not override minimized state in SysUI when IME adjust change
comes in.
- Do not animate IME adjust if we are already animating for minimized.
This lead to problems that we animated the minimized state with the IME
adjust values.
- Make sure to update state after checking whether the IME adjust is
animating. This is to fix an issue where sometimes the IME adjust
animation didn't run because the old target was wrong.
Change-Id: Ie35e2f943a4cda99ffdc6f14663d892863759e46
Fixes:
28819201
Christopher Tate [Mon, 16 May 2016 18:52:41 +0000 (11:52 -0700)]
Explicitly close pipe end when we cease operations...
...because the other in-VM reference to that FD means that it won't
get GC'd after we release our local reference to the containing object,
and we wind up with the feeder end blocking on write to a still-fully-
open pipe rather than being made aware that the read end has needed
to shut down.
Bug
28756668
Change-Id: I90b6aaeaabe7d912d96d7ef57c24f68d87d9d0ab
Eric Schmidt [Wed, 18 May 2016 19:23:31 +0000 (19:23 +0000)]
Merge "docs: Updates to GIFs on WH home page" into mnc-io-docs
am:
5ca058d38e
* commit '
5ca058d38ec22e0a160859aee8d774dc59bf759c':
docs: Updates to GIFs on WH home page
Change-Id: I280afb495fb816376e368ca16c2a401adfeeb3a2
Eric Schmidt [Wed, 18 May 2016 19:18:50 +0000 (19:18 +0000)]
Merge "docs: Updates to GIFs on WH home page" into mnc-io-docs
Ruben Brunk [Wed, 18 May 2016 19:12:14 +0000 (19:12 +0000)]
Merge "Update VrListener location permission." into nyc-dev
am:
19397a4492
* commit '
19397a4492c250eff92a2a705a2799aff8dba173':
docs: Voice transcription - addition of known issue
Change-Id: I615f468bb4afa2f126455733b1e19cf19ad9f064
Bert McMeen [Wed, 18 May 2016 19:07:28 +0000 (19:07 +0000)]
Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs am:
6c5d5320e4
am:
df502ca47d
* commit '
df502ca47d3a169bd7959fb3dc6c1da4aba76f53':
docs: Voice transcription - addition of known issue
Change-Id: I3322e6fa5125f51cc0ea1684b2b49258836e50e1
Ruben Brunk [Wed, 18 May 2016 19:07:18 +0000 (19:07 +0000)]
Merge "Update VrListener location permission." into nyc-dev
am:
403970c3ce
* commit '
403970c3ce8fe76b34ff966c43e3e11debeef582':
Update VrListener location permission.
Change-Id: Ie40926579463b1f08c7f490be63f83e32854470b
Baligh Uddin [Wed, 18 May 2016 19:07:14 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
aebe22dbc3 -s ours
* commit '
aebe22dbc3460b56dcd822199aabdc468ca227dc':
Import translations. DO NOT MERGE
Change-Id: Ib76288b42cadb1c0d83ef933e57b588753df821e
Jeff Sharkey [Wed, 18 May 2016 19:02:30 +0000 (19:02 +0000)]
Merge "Check processName when starting providers." into nyc-dev
am:
6bd012a799
* commit '
6bd012a799f1dfd3d40dc3d581d18fb36618f0b1':
Check processName when starting providers.
Change-Id: I5a7bfd0756d0e84288ae69ce2f2263d5a51ea045
Bert McMeen [Wed, 18 May 2016 19:01:16 +0000 (19:01 +0000)]
Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs
am:
6c5d5320e4
* commit '
6c5d5320e47bb7b52072e39e928a80573c27abd5':
docs: Voice transcription - addition of known issue
Change-Id: If9787e5acd50dd451b015305aa3ba7d3f82b5dc3
Ruben Brunk [Wed, 18 May 2016 18:57:08 +0000 (18:57 +0000)]
Merge "Update VrListener location permission." into nyc-dev
Bert McMeen [Wed, 18 May 2016 18:57:02 +0000 (18:57 +0000)]
Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs
Baligh Uddin [Wed, 18 May 2016 18:56:43 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 18:56:40 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jeff Sharkey [Wed, 18 May 2016 18:52:02 +0000 (18:52 +0000)]
Merge "Check processName when starting providers." into nyc-dev
Amith Yamasani [Wed, 18 May 2016 17:54:04 +0000 (10:54 -0700)]
Fix a deadlock in system server
Don't call into DPMS with PackageManager lock held. Doh!
Bug:
28828415
Change-Id: I08437d849236374acc0d804fe31aba703af385ba
Eric Schmidt [Wed, 18 May 2016 17:16:14 +0000 (10:16 -0700)]
docs: Updates to GIFs on WH home page
Bug:
28317418
Change-Id: I848dd7fa8c9c17681c514dc4ef10ccb9133e4200
Bert McMeen [Wed, 18 May 2016 18:43:36 +0000 (11:43 -0700)]
docs: Voice transcription - addition of known issue
Bug:
28836448
Change-Id: Ie5df3860d85ab357ec133142c5a4a58eba02d9fa
Michael Wright [Wed, 18 May 2016 18:42:18 +0000 (18:42 +0000)]
docs: Fix attr link in support lib docs. am:
eea825d67e am:
252b996fee am:
97fd87bd5f
am:
1a9158e271
* commit '
1a9158e271e413da884c13e8022142a3aa00213f':
docs: Fix attr link in support lib docs.
Change-Id: I7d51f3289b551877939cd0b5677faa0dac5f01d1
Michael Wright [Wed, 18 May 2016 18:34:10 +0000 (18:34 +0000)]
docs: Fix attr link in support lib docs. am:
eea825d67e am:
252b996fee
am:
97fd87bd5f
* commit '
97fd87bd5fbe4ccc1cca4f3eda2df7006fefecf3':
docs: Fix attr link in support lib docs.
Change-Id: I5b502a43efade5c85c8cd625e3d26f6200140362
Michael Wright [Wed, 18 May 2016 18:29:03 +0000 (18:29 +0000)]
docs: Fix attr link in support lib docs. am:
eea825d67e
am:
252b996fee
* commit '
252b996feea8b9d5c9c0101ca35753099feba15a':
docs: Fix attr link in support lib docs.
Change-Id: I0164d7eed51b156767ddabc63804044db9e54be4
Michael Wright [Wed, 18 May 2016 18:21:55 +0000 (18:21 +0000)]
docs: Fix attr link in support lib docs.
am:
eea825d67e
* commit '
eea825d67e271ac4adc48fd696d8cf7f4cbe0dc5':
docs: Fix attr link in support lib docs.
Change-Id: I5901dcbd2ed759ea559dc071309329eb008950dc
Andrew Solovay [Wed, 18 May 2016 18:16:58 +0000 (18:16 +0000)]
docs: Quick release-notes fix am:
29329dd3f1 am:
1f279c1ab0
am:
eddf9bfc36
* commit '
eddf9bfc36aea60736695c3da9264414d7629ceb':
docs: Quick release-notes fix
Change-Id: I27b568b1e6de8b60a4a5496617de8b02c58edfbc
Michael Wright [Wed, 18 May 2016 14:58:39 +0000 (15:58 +0100)]
docs: Fix attr link in support lib docs.
This issue was breaking the build in nyc-docs; Michael made the fix
there, so I'm cherrypicking it back to our doc branches.
Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
(cherry picked from commit
ae316f842431254ce364cda4f1edde6fe607ab43)
Andrew Solovay [Wed, 18 May 2016 18:08:18 +0000 (18:08 +0000)]
docs: Quick release-notes fix am:
29329dd3f1
am:
1f279c1ab0
* commit '
1f279c1ab030fb78ba193d9b91999bc8d98ae300':
docs: Quick release-notes fix
Change-Id: Ic785186da0288b565c5ee4fca4b748290aa640e7
Baligh Uddin [Wed, 18 May 2016 18:04:34 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
576a32da20 -s ours
* commit '
576a32da207ec435aa466985c827bc56709db5eb':
Import translations. DO NOT MERGE
Change-Id: Ia94fd9edaeef8625d85988d42cd56547a0bbdcd0
Baligh Uddin [Wed, 18 May 2016 18:04:30 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cb6e5df633 -s ours
* commit '
cb6e5df633fec75832f80b1d89ae6cac60a9be83':
Import translations. DO NOT MERGE
Change-Id: I1b809754ebd93b4e45786a0b22b6d24940d3a6cd
Baligh Uddin [Wed, 18 May 2016 18:04:27 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e6ee2d7e11 -s ours
* commit '
e6ee2d7e1188a0397bdd198708a0c87b8bbe00d7':
Import translations. DO NOT MERGE
Change-Id: Icbd5a05067e61eb95513823ad9f90840dd1f0674
Andrew Solovay [Wed, 18 May 2016 18:04:08 +0000 (18:04 +0000)]
docs: Quick release-notes fix
am:
29329dd3f1
* commit '
29329dd3f154bf33f1a2c85b0f49ad232d6f1dcc':
docs: Quick release-notes fix
Change-Id: If1c368952b60be8df8457c38e4d4e7a4ac22e525
Baligh Uddin [Wed, 18 May 2016 17:57:27 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Wed, 18 May 2016 17:57:25 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 17:57:19 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Wed, 18 May 2016 17:57:17 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 17:57:13 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Wed, 18 May 2016 17:54:35 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Wed, 18 May 2016 17:54:32 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bert McMeen [Wed, 18 May 2016 17:42:42 +0000 (17:42 +0000)]
docs: Downloads change for \'I\' build am:
90433cf4d8 am:
996c9839d6
am:
51136f409f
* commit '
51136f409f62f0623d8014bae132e4c9edfe1366':
docs: Downloads change for 'I' build
Change-Id: I68f037b13c2a02dc2a3c34027f13f5300078ebe4
Bert McMeen [Wed, 18 May 2016 17:37:17 +0000 (17:37 +0000)]
docs: Downloads change for \'I\' build am:
90433cf4d8
am:
996c9839d6
* commit '
996c9839d657ddb98c5c69f902cd33d45bea7663':
docs: Downloads change for 'I' build
Change-Id: I027756f3e51efdd81e01f2a2fbe268044ca3c9b5
Bert McMeen [Wed, 18 May 2016 17:32:01 +0000 (17:32 +0000)]
docs: Downloads change for \'I\' build
am:
90433cf4d8
* commit '
90433cf4d8de469568202a7ca15a14d76db73f2a':
docs: Downloads change for 'I' build
Change-Id: I9230b82f48d391245882150af67c949e6ae102dc
Andrew Solovay [Wed, 18 May 2016 17:29:52 +0000 (10:29 -0700)]
docs: Quick release-notes fix
DD asked to pull this sentence out. See first comment for doc stage
location, but if it builds and stages without trouble I'll go ahead
and submit.
Change-Id: Ie9844cf60bfd723dea8dbfd42eb04465dde84ae3
Sudheer Shanka [Wed, 18 May 2016 17:14:29 +0000 (17:14 +0000)]
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
am:
0d902adbbc
* commit '
0d902adbbc729f87f94fd70d9a6331e551108bc0':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
TreeHugger Robot [Wed, 18 May 2016 17:09:44 +0000 (17:09 +0000)]
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
Tony Mak [Wed, 18 May 2016 17:05:44 +0000 (17:05 +0000)]
Should check isDeviceSecure in shouldConfirmCredentials
am:
ae13e18c55
* commit '
ae13e18c5561537e062f46ddda8e5dff30d1fe26':
Should check isDeviceSecure in shouldConfirmCredentials
Change-Id: I21caafc40cdaa65cddca374bd5ec02ad18ae12be
Tony Mak [Tue, 17 May 2016 15:36:14 +0000 (16:36 +0100)]
Should check isDeviceSecure in shouldConfirmCredentials
The NPE is because createConfirmDeviceCredentialIntent returns a null
intent when it founds that user does not set a secure lock.
So the fix is we should check is the user set a secure lock screen as well.
The reason the crash only happens in multi-window flow because
we have null checking in
the normal flow (i.e. interceptWithConfirmCredentialsIfNeeded).
But I think we better check it explicitly.
Bug:
28716456
Change-Id: Ib204cd02c0007bd1df36908bb3b5254ec4ffb914
Mady Mellor [Wed, 18 May 2016 16:47:57 +0000 (16:47 +0000)]
Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
am:
048cabdbcb
* commit '
048cabdbcbc262869a5b737a22ccddb5ef0d76f9':
Ensure background is shown behind gear when notifications overlap
Change-Id: Idd2839db81350906ba36f1a17feebfc239d5d2c2
Mady Mellor [Wed, 18 May 2016 16:43:11 +0000 (16:43 +0000)]
Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
Felipe Leme [Wed, 18 May 2016 16:34:19 +0000 (16:34 +0000)]
Merge "Use batching to set firewall rules." into nyc-dev
am:
e821f3d032
* commit '
e821f3d032b4cd738a9b61549559b8b76b3ae09e':
Use batching to set firewall rules.
Change-Id: I93bc587f8dc3bff15efcd394f4dc03d30b5e287f
Bert McMeen [Wed, 18 May 2016 16:34:09 +0000 (09:34 -0700)]
docs: Downloads change for 'I' build
Bug:
28833659
Change-Id: Ifd5865d78960a58a6e8238225bc206978e84eb8f
TreeHugger Robot [Wed, 18 May 2016 16:26:43 +0000 (16:26 +0000)]
Merge "Use batching to set firewall rules." into nyc-dev
Jaewan Kim [Wed, 18 May 2016 15:50:59 +0000 (15:50 +0000)]
Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
am:
4e08800a7e
* commit '
4e08800a7e196cc94c1ed3fdcf6a492aa86055d2':
PIP: Fix NPE when enters Recents with PIP
Change-Id: I6e8172d0a5fe6d6f12474b188b1e1ca52b927bfd
Jaewan Kim [Wed, 18 May 2016 15:46:45 +0000 (15:46 +0000)]
Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
Robert Sesek [Wed, 18 May 2016 15:32:18 +0000 (15:32 +0000)]
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
am:
f45bc095c6
* commit '
f45bc095c6cef916f5f801fb320b3413f0fc099a':
Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.
Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
Philip P. Moltmann [Wed, 18 May 2016 15:32:15 +0000 (15:32 +0000)]
Merge "Handle printers selected by SelectPrinter activity" into nyc-dev
am:
746de4e9c8
* commit '
746de4e9c87d3068643a97a3b0b5709ffdbb4ad6':
Handle printers selected by SelectPrinter activity
Change-Id: Ie22f3d5d2b483a8a6354cb9968e939a80b6b1855
Cheryl Potter [Wed, 18 May 2016 15:28:00 +0000 (15:28 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592 am:
d1da82f616 am:
06c815fc74 am:
d45800d2e3
am:
3e9304127e
* commit '
3e9304127e7b59d66aff50f406a270e23c8cb208':
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592
Change-Id: I21df6a1f604d5b67ef136f45fccfc6ba8746da5e
Philip P. Moltmann [Tue, 17 May 2016 18:34:47 +0000 (11:34 -0700)]
Declare no print services if 0 print services are enabled.
Fixes:
28833953
Change-Id: I94e77dc23107fab10d45f51169d71e4da574ee66
Robert Sesek [Wed, 18 May 2016 15:25:40 +0000 (15:25 +0000)]
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
Philip P. Moltmann [Wed, 18 May 2016 15:24:20 +0000 (15:24 +0000)]
Merge "Handle printers selected by SelectPrinter activity" into nyc-dev
Cheryl Potter [Wed, 18 May 2016 15:22:34 +0000 (15:22 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592 am:
d1da82f616 am:
06c815fc74
am:
d45800d2e3
* commit '
d45800d2e31550520dd6f3210b309ae3abaa4471':
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592
Change-Id: Id7298a4811e157030f51646618b600a13a65ad77
Cheryl Potter [Wed, 18 May 2016 15:17:44 +0000 (15:17 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592 am:
d1da82f616
am:
06c815fc74
* commit '
06c815fc74de27e7ca053f81c8972e268810de13':
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592
Change-Id: I9597dba7e1f5c13c88dc1f3d2ba516418d679260
Michael Wright [Wed, 18 May 2016 15:13:13 +0000 (15:13 +0000)]
Merge changes from topic \'bad-attr-buildfix\' into nyc-dev
am:
7e91ec88ef
* commit '
7e91ec88ef61343345defe58ea968228b10d003a':
Fix attr link in support lib docs.
Revert "Revert "docs: Creating new support library revision history page""
Change-Id: Ie2bdbbb96678a1e5cf6fe5e21d722335749cd7f7
Narayan Kamath [Wed, 18 May 2016 15:13:10 +0000 (15:13 +0000)]
Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev
am:
9f33e5cccc
* commit '
9f33e5cccc8816ed8d41716eb172ec28b9935946':
PackageManager: Fix reference profile canonicalization.
Change-Id: I089272599a7d03b6e4b210cf5cc2c38a5659eeeb
Cheryl Potter [Wed, 18 May 2016 15:11:54 +0000 (15:11 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592
am:
d1da82f616
* commit '
d1da82f61614388c181ccbc9d4de2cfb6522c071':
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/
28826469 b/
28705592
Change-Id: I0c2acc2d5204d34c177b534d7dd4b5ae5200f98f
Michael Wright [Wed, 18 May 2016 15:07:36 +0000 (15:07 +0000)]
Merge changes from topic 'bad-attr-buildfix' into nyc-dev
* changes:
Fix attr link in support lib docs.
Revert "Revert "docs: Creating new support library revision history page""
Narayan Kamath [Wed, 18 May 2016 15:04:18 +0000 (15:04 +0000)]
Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev
Michael Wright [Wed, 18 May 2016 14:58:39 +0000 (15:58 +0100)]
Fix attr link in support lib docs.
It accidentally pointed to the media router resources rather than the
app compat ones.
Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
Svet Ganov [Wed, 18 May 2016 14:38:24 +0000 (07:38 -0700)]
Hide ephemeral API
bug:
28825660
Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
Michael Wright [Wed, 18 May 2016 14:24:36 +0000 (15:24 +0100)]
Revert "Revert "docs: Creating new support library revision history page""
This reverts commit
982fd043357759bfdf619bc24f3a5f4366a3aac0.
Toni Barzic [Wed, 18 May 2016 14:16:01 +0000 (14:16 +0000)]
Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev
am:
5201a6246d
* commit '
5201a6246d12830d0bb766d59e22b0320f2f99dc':
Handle PhoneStatusBarPolicy user switch callbacks on main thread
Change-Id: I561be9cf58d0a43abd43d98cf1ee717241f10ef1
Julia Reynolds [Wed, 18 May 2016 14:09:49 +0000 (14:09 +0000)]
Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev
Narayan Kamath [Mon, 16 May 2016 16:34:48 +0000 (17:34 +0100)]
PackageManager: Fix reference profile canonicalization.
Foreign dex markers are named in the runtime by calling realpath(3) on the input
dexfile path and replacing "/" with "@". On the Java side, we're using
File.getCanonicalPath, which is similar but isn't quite the same. It tries
to call realpath() directly, but if that fails, it resorts to a series of
increasingly desperate measures to calculate a "canonical path". We just
use realpath instead.
Also, don't attempt to delete a profile if canonicalization fails.
bug:
28740848
Change-Id: Ie5d5af590187e793db633342a42b923865e5c005
Nicolas Prevot [Wed, 18 May 2016 11:31:28 +0000 (11:31 +0000)]
Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev
am:
bbd26bc023
* commit '
bbd26bc023992ee7bc6a0e682d4a343dfe3dc848':
Refactor how StatusBarPolicy knows if keyguard is visible.
Change-Id: I782d354549ba3185d4779a2e8b3ac6d0724e22ec
Nicolas Prévot [Wed, 18 May 2016 11:21:44 +0000 (11:21 +0000)]
Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev
Bart Sears [Wed, 18 May 2016 07:30:29 +0000 (07:30 +0000)]
Revert "docs: Creating new support library revision history page"
am:
982fd04335
* commit '
982fd043357759bfdf619bc24f3a5f4366a3aac0':
Revert "docs: Creating new support library revision history page"
Change-Id: Ie001e5763e62360cc6db568ffd51e43ae35e4554
Bart Sears [Wed, 18 May 2016 07:19:31 +0000 (07:19 +0000)]
Revert "docs: Creating new support library revision history page"
This reverts commit
09e9d24bcf9d80c3946fdbf0989bade053466d35.
Change-Id: Idbece8b39491eea7e2324916a5a88f08f2623f1f
OSDN Git Service
