OSDN Git Service
Bill Yi [Fri, 3 Jun 2016 17:05:11 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
c31029409a -s ours
* commit '
c31029409ada1e0c4a914b26e64cd0ac0820a323':
Import translations. DO NOT MERGE
Change-Id: I72a678ae2aa88ee246fbc5ed276fdcd3d52eaa33
Bill Yi [Fri, 3 Jun 2016 17:05:07 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
b51541753a -s ours
* commit '
b51541753a6267065d93a0846060467ce5bf1688':
Import translations. DO NOT MERGE
Change-Id: I63d94012dae2053fa343ad5ffc0bf0751a46e6b5
Bill Yi [Fri, 3 Jun 2016 17:05:04 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4233404ee4 -s ours
* commit '
4233404ee4f33a55dcee898939d19b78e4b027c8':
Import translations. DO NOT MERGE
Change-Id: I02e0874f7a79ff45eca3498340e7d19b9d0cdd28
TreeHugger Robot [Fri, 3 Jun 2016 16:55:20 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:47 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:27 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Robert Greenwalt [Fri, 3 Jun 2016 16:44:29 +0000 (16:44 +0000)]
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am:
6a5c9560a3
* commit '
6a5c9560a33337fc82362d77bc4bae633953428d':
Add support for UNSOL PCO Data.
Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
Robert Greenwalt [Fri, 3 Jun 2016 16:38:57 +0000 (16:38 +0000)]
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 16:14:15 +0000 (16:14 +0000)]
Merge "Merge "Fix BigText transitions" into nyc-dev am:
2ab4f451dc am:
d49a86ceda" into nyc-mr1-dev-plus-aosp
Adrian Roos [Fri, 3 Jun 2016 16:13:46 +0000 (16:13 +0000)]
Merge "Fix BigText transitions" into nyc-dev am:
2ab4f451dc
am:
50844bc504
* commit '
50844bc50429e6e6f4f0d33b177491c25f47e6ce':
Fix BigText transitions
Change-Id: I822241014f796954ee80e5d3ad2ba747f2ef1f03
Adrian Roos [Fri, 3 Jun 2016 16:13:44 +0000 (16:13 +0000)]
Merge "Fix BigText transitions" into nyc-dev am:
2ab4f451dc
am:
d49a86ceda
* commit '
d49a86ceda243515019d267d4fbecc3cc99cb456':
Fix BigText transitions
Change-Id: Ife5601ffb5323f73e817881d47a7ead1c89f2504
Adrian Roos [Fri, 3 Jun 2016 15:53:09 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am:
2ab4f451dc
* commit '
2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
Adrian Roos [Fri, 3 Jun 2016 15:53:07 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am:
2ab4f451dc
* commit '
2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
Makoto Onuki [Fri, 3 Jun 2016 15:37:10 +0000 (15:37 +0000)]
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am:
37087ad710
* commit '
37087ad710087755786c115508b14e053c47f882':
ShortcutManager: Implement usage report API
Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
TreeHugger Robot [Fri, 3 Jun 2016 15:36:10 +0000 (15:36 +0000)]
Merge "Fix BigText transitions" into nyc-dev
Makoto Onuki [Fri, 3 Jun 2016 15:21:44 +0000 (15:21 +0000)]
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 13:47:12 +0000 (13:47 +0000)]
Merge "Don\'t leak guts. am:
cdf98e1964 am:
08cc30378c" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 3 Jun 2016 13:46:47 +0000 (13:46 +0000)]
Don\'t leak guts. am:
cdf98e1964
am:
0853233433
* commit '
0853233433958eb9c97d8237341be58895e8a541':
Don't leak guts.
Change-Id: Ifa768e26b323a46cd595feebaec2e947415b938e
Julia Reynolds [Fri, 3 Jun 2016 13:46:43 +0000 (13:46 +0000)]
Don\'t leak guts. am:
cdf98e1964
am:
08cc30378c
* commit '
08cc30378c12c47250ab05491346d940194a29f8':
Don't leak guts.
Change-Id: Ieea32af97aef5a75633112bb15bf6d6453080dab
Julia Reynolds [Fri, 3 Jun 2016 13:33:11 +0000 (13:33 +0000)]
Don\'t leak guts.
am:
cdf98e1964
* commit '
cdf98e1964489916c68e240bd92c2e0bedab3c2d':
Don't leak guts.
Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
Julia Reynolds [Fri, 3 Jun 2016 13:33:08 +0000 (13:33 +0000)]
Don\'t leak guts.
am:
cdf98e1964
* commit '
cdf98e1964489916c68e240bd92c2e0bedab3c2d':
Don't leak guts.
Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e
Julia Reynolds [Thu, 2 Jun 2016 20:04:56 +0000 (16:04 -0400)]
Don't leak guts.
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes:
29064258
Bill Yi [Fri, 3 Jun 2016 13:09:07 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e818cdd84923a3b9cda7d4954ba5f492a9817f4
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 13:01:48 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46dc39205d2e1652f96638ed246431742c63f93e
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:50:16 +0000 (04:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibee7d58074781c85c28496af8ad0702b51fd85a8
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 3 Jun 2016 10:55:27 +0000 (10:55 +0000)]
Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am:
33d03a9e43 am:
d73c6eb6f3" into nyc-mr1-dev-plus-aosp
Tony Mak [Fri, 3 Jun 2016 10:54:56 +0000 (10:54 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am:
33d03a9e43
am:
d73c6eb6f3
* commit '
d73c6eb6f3b7fa9ac7729e1e870b4285d42b9b44':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Ia07e1d86214ca226aa0802c2ab6f6628da631937
Tony Mak [Fri, 3 Jun 2016 10:54:46 +0000 (10:54 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am:
33d03a9e43
am:
fff6650de4
* commit '
fff6650de4ac847db61ffdf3fbc82a39e3878313':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
Tony Mak [Fri, 3 Jun 2016 10:43:37 +0000 (10:43 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
Tony Mak [Fri, 3 Jun 2016 10:43:30 +0000 (10:43 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
Tony Mak [Thu, 2 Jun 2016 14:01:16 +0000 (15:01 +0100)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.
Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.
Bug:
29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
Android Build Merger (Role) [Fri, 3 Jun 2016 03:14:42 +0000 (03:14 +0000)]
Merge "Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d am:
9ad88ce3fe am:
46a51cb108" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Fri, 3 Jun 2016 03:14:18 +0000 (03:14 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d am:
9ad88ce3fe
am:
46a51cb108
* commit '
46a51cb10804374700647399635db0ffb1bfcfbe':
docs: Fixed background optmizations code snippet
Change-Id: I95eaace44c1b0385f5d97ef3ddf726ae346551a0
Eric Schmidt [Fri, 3 Jun 2016 03:14:01 +0000 (03:14 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d am:
9ad88ce3fe
am:
637ccf7585
* commit '
637ccf758567e128b248078e2bd8e99f7663cda8':
docs: Fixed background optmizations code snippet
Change-Id: Ib5bc0fb814758db2e2ad9352792085a9bc7fb74a
Eric Schmidt [Fri, 3 Jun 2016 03:06:49 +0000 (03:06 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d
am:
9ad88ce3fe
* commit '
9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
docs: Fixed background optmizations code snippet
Change-Id: Ib5aeb12e19841f86c8d625d4ea2b1a3f0df4e766
Eric Schmidt [Fri, 3 Jun 2016 03:06:44 +0000 (03:06 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d
am:
9ad88ce3fe
* commit '
9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
docs: Fixed background optmizations code snippet
Change-Id: I1a68f03403c34993525487f604422367f35fc0a0
Eric Schmidt [Fri, 3 Jun 2016 02:59:57 +0000 (02:59 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8
am:
76297d719d
* commit '
76297d719d5bbe2dcce65c357591c22b1a1d3293':
docs: Fixed background optmizations code snippet
Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
Eric Schmidt [Fri, 3 Jun 2016 02:52:51 +0000 (02:52 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am:
0b8eb8c1e8
* commit '
0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
docs: Fixed background optmizations code snippet
Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
Eric Schmidt [Fri, 3 Jun 2016 02:41:45 +0000 (02:41 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
Andrii Kulian [Fri, 3 Jun 2016 02:15:57 +0000 (02:15 +0000)]
Merge "Fix task selection logic" into nyc-dev am:
265bd89c3c
am:
8aadde745f
* commit '
8aadde745fdd245a9263d81666fcd3f5f042f0fc':
Change-Id: I09d516df9e22030d82c5e10594274b0ebe1644f2
Andrii Kulian [Fri, 3 Jun 2016 02:10:04 +0000 (02:10 +0000)]
Merge "Fix task selection logic" into nyc-dev am:
265bd89c3c
am:
f4b91fe3e1
* commit '
f4b91fe3e18b98e575cf498a5fdbcd8ad9603ce1':
Fix task selection logic
Change-Id: I4d665fad6c972bdb11a192256d21f5fb9a27c96a
Andrii Kulian [Fri, 3 Jun 2016 02:07:11 +0000 (02:07 +0000)]
Merge "Fix task selection logic" into nyc-dev
am:
265bd89c3c
* commit '
265bd89c3cb6f99d38d2f126a88c12fc6502431c':
Fix task selection logic
Change-Id: If3b8b7d80885b7e5573b03f83f2cb31cfc0e6670
Zhijun He [Fri, 3 Jun 2016 02:07:10 +0000 (02:07 +0000)]
Merge "Camera2: add deferred output config support" into nyc-mr1-dev
am:
e8526a0105
* commit '
e8526a01051fc2b8929870c8bff28f1d6b8b652c':
Camera2: add deferred output config support
Change-Id: I5bfa1c90e4ab5910ccd3a8727b95200e4b4221ca
Andrii Kulian [Fri, 3 Jun 2016 02:07:04 +0000 (02:07 +0000)]
Merge "Fix task selection logic" into nyc-dev
am:
265bd89c3c
* commit '
265bd89c3cb6f99d38d2f126a88c12fc6502431c':
Fix task selection logic
Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72
Andrii Kulian [Fri, 3 Jun 2016 01:37:50 +0000 (01:37 +0000)]
Merge "Fix task selection logic" into nyc-dev
Zhijun He [Fri, 3 Jun 2016 01:13:59 +0000 (01:13 +0000)]
Merge "Camera2: add deferred output config support" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 01:05:02 +0000 (01:05 +0000)]
Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am:
0bc61eb176 am:
fa790104f2" into nyc-mr1-dev-plus-aosp
Pankaj Kanwar [Fri, 3 Jun 2016 01:04:30 +0000 (01:04 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am:
0bc61eb176
am:
fa790104f2
* commit '
fa790104f221563ebfd17813262c540b2751598c':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I15c414be645c7aab9b2bd1262dd57b83ca8e652a
Pankaj Kanwar [Fri, 3 Jun 2016 01:04:27 +0000 (01:04 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am:
0bc61eb176
am:
c9e93d4294
* commit '
c9e93d42948bf3f9d4fce748b4c896a3a081bfde':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I604d7fe975e3d7917014df470c9c42ada7d2808a
Pavlin Radoslavov [Fri, 3 Jun 2016 01:00:35 +0000 (01:00 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am:
0bc61eb176
* commit '
0bc61eb176644e243b0e131a29a5f66a4303d9b0':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: Ia2aed3304039a672961608fc900ab8996f67d716
Pavlin Radoslavov [Fri, 3 Jun 2016 01:00:34 +0000 (01:00 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am:
0bc61eb176
* commit '
0bc61eb176644e243b0e131a29a5f66a4303d9b0':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
Pankaj Kanwar [Fri, 3 Jun 2016 00:55:48 +0000 (00:55 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
Sanket Padawe [Fri, 3 Jun 2016 00:48:39 +0000 (00:48 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am:
b68601d247
am:
701cd3fe15
* commit '
701cd3fe15148f561c27b9a2b65da79b6f36c1c8':
Change-Id: Ic8ee22af2923a4c8847966d34b7e03712bcfc09e
Sanket Padawe [Fri, 3 Jun 2016 00:44:49 +0000 (00:44 +0000)]
Merge "Merge commit \'
b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev
am:
1a6b6fc266
* commit '
1a6b6fc2664305de6e7102fa96506910fb7705dd':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
Todd Kennedy [Fri, 3 Jun 2016 00:38:26 +0000 (00:38 +0000)]
Merge "Round icons" into nyc-mr1-dev
am:
7d64d64269
* commit '
7d64d642692ff6728ee83e1a0d8658909d1bdd44':
Round icons
Change-Id: I5578f3eb7b7ffc7791a5a4305b0defba38963bba
Adam Lesinski [Fri, 3 Jun 2016 00:38:23 +0000 (00:38 +0000)]
Merge "Allow uses-library under <application>" into nyc-mr1-dev
am:
c878fb0cb8
* commit '
c878fb0cb8a901aae71d965a57e75e682eb6f67f':
Allow uses-library under <application>
Change-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667
Sanket Padawe [Fri, 3 Jun 2016 00:34:02 +0000 (00:34 +0000)]
Merge "Merge commit '
b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 00:32:34 +0000 (00:32 +0000)]
Merge "Round icons" into nyc-mr1-dev
Adam Lesinski [Fri, 3 Jun 2016 00:31:36 +0000 (00:31 +0000)]
Merge "Allow uses-library under <application>" into nyc-mr1-dev
Zhijun He [Mon, 30 May 2016 21:54:39 +0000 (14:54 -0700)]
Camera2: add deferred output config support
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.
Bug:
28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
Suprabh Shukla [Fri, 3 Jun 2016 00:23:14 +0000 (00:23 +0000)]
Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev
am:
67f82d16ea
* commit '
67f82d16ea31f309b402b3a96bafcc9338528ece':
Adding an idle timeout to restart demo session
Change-Id: I11db70fd323fb908aa137dedf1817fa28b577d79
Sanket Padawe [Fri, 3 Jun 2016 00:20:08 +0000 (17:20 -0700)]
Merge commit '
b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
TreeHugger Robot [Fri, 3 Jun 2016 00:18:16 +0000 (00:18 +0000)]
Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev
Adam Lesinski [Tue, 31 May 2016 22:07:20 +0000 (15:07 -0700)]
Allow uses-library under <application>
Bug:
29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23
Sanket Padawe [Thu, 2 Jun 2016 23:15:57 +0000 (23:15 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
am:
b68601d247
* commit '
b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
Sanket Padawe [Thu, 2 Jun 2016 23:11:21 +0000 (23:11 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
Todd Kennedy [Thu, 2 Jun 2016 21:13:56 +0000 (14:13 -0700)]
Round icons
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".
Bug:
28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
Makoto Onuki [Fri, 20 May 2016 23:39:42 +0000 (16:39 -0700)]
ShortcutManager: Implement usage report API
Bug
28536054
Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
Svetoslav Ganov [Thu, 2 Jun 2016 22:56:48 +0000 (22:56 +0000)]
Merge "Properly set default voice interactor" into nyc-dev am:
e34bb5a1ff
am:
bd28e027ed
* commit '
bd28e027ed87da6cdc2313481439aeab021b2820':
Change-Id: Ieba2c125f5ea43ee9fe345a48e86415a55c1df5d
Android Build Merger (Role) [Thu, 2 Jun 2016 22:48:18 +0000 (22:48 +0000)]
Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am:
f6be4c023f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 22:48:08 +0000 (22:48 +0000)]
Merge "Merge "Do not rotate PDFPrinter pages." into nyc-dev am:
5d6a4f582e am:
1eabaff2cb" into nyc-mr1-dev-plus-aosp
Makoto Onuki [Thu, 2 Jun 2016 22:47:32 +0000 (22:47 +0000)]
Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev
am:
f6be4c023f
* commit '
f6be4c023fbd29d14fdd0b8df6b939b8a46cf553':
ShortcutManager: Break down unit tests
Change-Id: I31bb7fb30e4de121447acbe1ec5915cde6ae4f7f
Svetoslav Ganov [Thu, 2 Jun 2016 22:47:29 +0000 (22:47 +0000)]
Merge "Properly set default voice interactor" into nyc-dev am:
e34bb5a1ff
am:
13f802dc01
* commit '
13f802dc013866986be51328af21378783d19e61':
Properly set default voice interactor
Change-Id: I29c2a1490877d4b25ca64fee8a53c6970d07a1f2
Philip P. Moltmann [Thu, 2 Jun 2016 22:47:27 +0000 (22:47 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev am:
5d6a4f582e
am:
1eabaff2cb
* commit '
1eabaff2cb9f97c412102a564bc90ce47a8b2adb':
Do not rotate PDFPrinter pages.
Change-Id: I1988f9f05ca1c16f0aac11b3e58d5b3c9b673985
Svetoslav Ganov [Thu, 2 Jun 2016 22:47:26 +0000 (22:47 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
am:
e34bb5a1ff
* commit '
e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
Properly set default voice interactor
Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
Philip P. Moltmann [Thu, 2 Jun 2016 22:47:26 +0000 (22:47 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev am:
5d6a4f582e
am:
bf0f82bd69
* commit '
bf0f82bd69433a018fc767fa7bd8ca5145927610':
Do not rotate PDFPrinter pages.
Change-Id: Ied59f3b9e33e2ff03d1760f6f2958821ba82dda9
Svetoslav Ganov [Thu, 2 Jun 2016 22:43:41 +0000 (22:43 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
am:
e34bb5a1ff
* commit '
e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
Properly set default voice interactor
Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
Makoto Onuki [Thu, 2 Jun 2016 22:42:02 +0000 (22:42 +0000)]
Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev
Philip P. Moltmann [Thu, 2 Jun 2016 22:41:15 +0000 (22:41 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
am:
5d6a4f582e
* commit '
5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
Do not rotate PDFPrinter pages.
Change-Id: Ib428e9af14a8271545862189649780975053de86
Suprabh Shukla [Thu, 2 Jun 2016 07:31:41 +0000 (00:31 -0700)]
Adding an idle timeout to restart demo session
Tracking user activity from RetailModeManagerService to start and switch
to a new demo user when there has been no activity for a long time and
the demo video player has been disabled.
Bug:
27280140
Change-Id: Iebf37b5d04a659e4bfda0e4016111c7b9e5f4eb9
Philip P. Moltmann [Thu, 2 Jun 2016 22:37:22 +0000 (22:37 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
am:
5d6a4f582e
* commit '
5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
Do not rotate PDFPrinter pages.
Change-Id: I1f24415c1f7245f5bee5fb24f7d642c0e22a3bdd
Svetoslav Ganov [Thu, 2 Jun 2016 22:36:04 +0000 (22:36 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
Jorim Jaggi [Thu, 2 Jun 2016 22:26:59 +0000 (22:26 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am:
6321f42fbe
am:
02082ad631
* commit '
02082ad6317d1b53c35b8e6239d4c41dedd5533a':
Change-Id: I3f8dd98e2fb7c38e6cd53741806e5aa6b6c547ed
Svetoslav Ganov [Thu, 2 Jun 2016 22:25:12 +0000 (15:25 -0700)]
Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.
bug:
28963642
Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
Android Build Merger (Role) [Thu, 2 Jun 2016 22:22:55 +0000 (22:22 +0000)]
Merge "Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am:
6321f42fbe am:
a80c867adf" into nyc-mr1-dev-plus-aosp
Jorim Jaggi [Thu, 2 Jun 2016 22:22:34 +0000 (22:22 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am:
6321f42fbe
am:
a80c867adf
* commit '
a80c867adf9f2a19cb2d955e9594e5dda4840d26':
Fix unminimizing dock stack for AppTask.moveToFront
Change-Id: Id6b6296e7591307a54d685ff2d35e1ae85591512
Android Build Merger (Role) [Thu, 2 Jun 2016 22:22:14 +0000 (22:22 +0000)]
Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am:
84c074adb2" into nyc-mr1-dev-plus-aosp
Robert Greenwalt [Thu, 2 Jun 2016 20:43:27 +0000 (13:43 -0700)]
Add support for UNSOL PCO Data.
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.
bug:
28961371
bug:
28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
Annie Chin [Thu, 2 Jun 2016 22:20:32 +0000 (22:20 +0000)]
Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev
am:
84c074adb2
* commit '
84c074adb251135554f0ce1133ab7ec5d9c4aded':
Remove SystemUIFactory.getHomeLayoutId()
Change-Id: Iba4ea97d2e92a81fe355a3342e9a8cd7b134d0b5
Billy Lamberta [Thu, 2 Jun 2016 22:19:16 +0000 (22:19 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed am:
a092b6cdb9
am:
3050400767
* commit '
3050400767dc1fa163bcfce11d5fe78fb168bb7a':
Change-Id: Ib68f95d8502f03530f72a6f22ad28cfee2af4824
Jorim Jaggi [Thu, 2 Jun 2016 22:19:12 +0000 (22:19 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
am:
6321f42fbe
* commit '
6321f42fbee425745de9636d45e4973fa6c470b9':
Fix unminimizing dock stack for AppTask.moveToFront
Change-Id: I82b844611cb1761a681f91e2e26b25308202c6da
Jorim Jaggi [Thu, 2 Jun 2016 22:19:12 +0000 (22:19 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
am:
6321f42fbe
* commit '
6321f42fbee425745de9636d45e4973fa6c470b9':
Fix unminimizing dock stack for AppTask.moveToFront
Change-Id: I8cb3702db22d24de2aa64360e8e22577f320d00d
Billy Lamberta [Thu, 2 Jun 2016 22:14:19 +0000 (22:14 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed am:
a092b6cdb9
am:
24b4156861
* commit '
24b41568611961248d3d9ab906f667faa9b56015':
docs: work minisite post-launch fixes
Change-Id: I0de2811e52c36211fac542b22ba4b9c5a24bc57a
Billy Lamberta [Thu, 2 Jun 2016 22:10:08 +0000 (22:10 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed
am:
a092b6cdb9
* commit '
a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
docs: work minisite post-launch fixes
Change-Id: I39f4ea830be553013e8c9ce7989581b31fcbd994
Annie Chin [Thu, 2 Jun 2016 22:10:00 +0000 (22:10 +0000)]
Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev
Billy Lamberta [Thu, 2 Jun 2016 22:09:27 +0000 (22:09 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed
am:
a092b6cdb9
* commit '
a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
docs: work minisite post-launch fixes
Change-Id: If59f08e5eca51e6c21a53b01854b3e0dd6fac2a6
TreeHugger Robot [Thu, 2 Jun 2016 22:08:14 +0000 (22:08 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
Billy Lamberta [Thu, 2 Jun 2016 22:04:13 +0000 (22:04 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c
am:
84903c24ed
* commit '
84903c24ed74c75a2217648a96931cc3045143ea':
docs: work minisite post-launch fixes
Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
Billy Lamberta [Thu, 2 Jun 2016 21:59:29 +0000 (21:59 +0000)]
docs: work minisite post-launch fixes
am:
9fec73a47c
* commit '
9fec73a47c158df0a184a1f2a0301b6394cfec40':
docs: work minisite post-launch fixes
Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
OSDN Git Service
