OSDN Git Service
Bill Yi [Tue, 1 Nov 2016 07:56:02 +0000 (07:56 +0000)]
Import translations. DO NOT MERGE
am:
9a74480636 -s ours
Change-Id: I6b047207d6e7118e1e4009c565058c71ddc3bf28
Bill Yi [Tue, 1 Nov 2016 06:03:43 +0000 (23:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40881014752e3a1f1d95542a543f49925c4dff16
Auto-generated-cl: translation import
Damien Bargiacchi [Tue, 1 Nov 2016 01:53:15 +0000 (01:53 +0000)]
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev am:
71a865d22d
am:
cb3a109506
Change-Id: I44ed3b052960f10954db7dd536b7f874cde4a97e
Damien Bargiacchi [Tue, 1 Nov 2016 01:52:09 +0000 (01:52 +0000)]
Allow boot clock to be toggled between 12 and 24 hour format am:
9071db1d37
am:
3400dffcad
Change-Id: Ic4df64d163845547416ef1280ae2ba2f1b41efda
Damien Bargiacchi [Tue, 1 Nov 2016 01:46:41 +0000 (01:46 +0000)]
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev
am:
71a865d22d
Change-Id: I2530e1710742ab2ead8627004fa46aad410d455c
Damien Bargiacchi [Tue, 1 Nov 2016 01:46:37 +0000 (01:46 +0000)]
Allow boot clock to be toggled between 12 and 24 hour format
am:
9071db1d37
Change-Id: Ief7d44034df3a59adc2f65ba79154a1ee933040c
TreeHugger Robot [Tue, 1 Nov 2016 01:39:59 +0000 (01:39 +0000)]
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev
Makoto Onuki [Tue, 1 Nov 2016 01:23:10 +0000 (01:23 +0000)]
Always scan the Settings app for updated shortcuts. am:
ac2898228e am:
f0644d03a2
am:
4eb38c75f4
Change-Id: Ifc5c7d4493703bb16788165ea60c8a35408b259b
Makoto Onuki [Tue, 1 Nov 2016 01:17:30 +0000 (01:17 +0000)]
Always scan the Settings app for updated shortcuts. am:
ac2898228e
am:
f0644d03a2
Change-Id: I513b505be9cd3b273b76bd3d8578326400ddceb3
Makoto Onuki [Tue, 1 Nov 2016 01:12:34 +0000 (01:12 +0000)]
Always scan the Settings app for updated shortcuts.
am:
ac2898228e
Change-Id: I64f476ec3b4003e87004ab6c05536f91e659d39e
Makoto Onuki [Mon, 31 Oct 2016 22:32:17 +0000 (15:32 -0700)]
Always scan the Settings app for updated shortcuts.
The setting apps' version code is 25 for both DR and MR1, so the
shortcut manager will not notice when it's changed.
Let's just always scan this app.
Bug
32554059
Change-Id: Ia05363b30a5eeb989dc4c44cf5dbd71cde96de96
Sanket Agarwal [Mon, 31 Oct 2016 19:29:56 +0000 (19:29 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am:
ba63f32ed5 am:
50cc13cc18
am:
9e33f453a3
Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c
Sanket Agarwal [Mon, 31 Oct 2016 19:25:34 +0000 (19:25 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am:
ba63f32ed5
am:
50cc13cc18
Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
Sanket Agarwal [Mon, 31 Oct 2016 19:19:30 +0000 (19:19 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
am:
ba63f32ed5
Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea
Sanket Agarwal [Mon, 31 Oct 2016 19:08:53 +0000 (19:08 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
Marie Janssen [Mon, 31 Oct 2016 18:54:23 +0000 (18:54 +0000)]
resolve merge conflicts of
6a31a5c to stage-aosp-master am:
879a5169ec
am:
635d528877
Change-Id: I9a59aa4c657019ee06117591cb1a0bda4c67ea96
Marie Janssen [Mon, 31 Oct 2016 18:47:52 +0000 (18:47 +0000)]
resolve merge conflicts of
6a31a5c to stage-aosp-master
am:
879a5169ec
Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66
Marie Janssen [Mon, 31 Oct 2016 18:00:06 +0000 (11:00 -0700)]
resolve merge conflicts of
6a31a5c to stage-aosp-master
Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194
Sanket Agarwal [Thu, 4 Aug 2016 23:16:20 +0000 (16:16 -0700)]
Configuration for priority/auto-connection for PAN.
We protect the auto-connection via a flag so that it is only enabled on
some devices.
Bug: b/
30679978
Change-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce
(cherry picked from commit
1f09d5f255980488cabd55a5c44a5737e24541d8)
Brad Ebinger [Mon, 31 Oct 2016 17:22:46 +0000 (17:22 +0000)]
Merge "Modify AIDLs to include Session.Info" am:
78a63c1cf0 am:
9e4d4ee484
am:
3030cd855b
Change-Id: I4d9b66c81f4f9fbebeacd9aede566f660c4b1bb8
Treehugger Robot [Mon, 31 Oct 2016 17:20:39 +0000 (17:20 +0000)]
Merge "Bluetooth: prevent enabling BLE in airplane mode"
Brad Ebinger [Mon, 31 Oct 2016 17:17:57 +0000 (17:17 +0000)]
Merge "Modify AIDLs to include Session.Info" am:
78a63c1cf0
am:
9e4d4ee484
Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20
Brad Ebinger [Mon, 31 Oct 2016 17:12:26 +0000 (17:12 +0000)]
Merge "Modify AIDLs to include Session.Info"
am:
78a63c1cf0
Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552
Brad Ebinger [Mon, 31 Oct 2016 17:04:50 +0000 (17:04 +0000)]
Merge "Modify AIDLs to include Session.Info"
Marie Janssen [Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)]
Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.
Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.
Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble
Bug:
32140251
Bug:
32140271
Bug:
32369494
Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
Aga Madurska [Mon, 31 Oct 2016 11:59:29 +0000 (11:59 +0000)]
Update colors for the round scroll bar. am:
5177264735
am:
c78b695126
Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5
Aga Madurska [Mon, 31 Oct 2016 11:53:51 +0000 (11:53 +0000)]
Update colors for the round scroll bar.
am:
5177264735
Change-Id: I576d9149292cc23ac72a734d5ac3986d199f7db8
Aga Madurska [Mon, 31 Oct 2016 10:33:27 +0000 (10:33 +0000)]
Update colors for the round scroll bar.
Bug:
32536003
Change-Id: I35503c089bc918493aab3288580f81d7b780d671
Damien Bargiacchi [Sat, 29 Oct 2016 00:38:22 +0000 (17:38 -0700)]
Allow boot clock to be toggled between 12 and 24 hour format
Bug:
32461548
Change-Id: I414192e6d9f3ae44267f4a360e35647f18c420b4
Sanket Agarwal [Fri, 28 Oct 2016 20:28:50 +0000 (20:28 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533 am:
958dab93cd
am:
9527a19cbc
Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad
Brad Ebinger [Fri, 28 Oct 2016 20:26:51 +0000 (20:26 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am:
aacbdf59d6
am:
ccd8315969
Change-Id: If1e6819430977bf3978bbbf23f0f32fcb1c460d4
Brad Ebinger [Fri, 28 Oct 2016 20:25:34 +0000 (20:25 +0000)]
Modify AIDLs to include Session.Info am:
b32d4f8b5c
am:
668a6fa227
Change-Id: I7afb3692f4f26c37b96c98d7a1e173576dd7620b
Sanket Agarwal [Fri, 28 Oct 2016 20:19:14 +0000 (20:19 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533
am:
958dab93cd
Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
Brad Ebinger [Fri, 28 Oct 2016 20:17:15 +0000 (20:17 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am:
aacbdf59d6
Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934
Brad Ebinger [Fri, 28 Oct 2016 20:17:03 +0000 (20:17 +0000)]
Modify AIDLs to include Session.Info
am:
b32d4f8b5c
Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
Sanket Agarwal [Fri, 28 Oct 2016 20:13:57 +0000 (20:13 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
am:
678ba24533
Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
Sanket Agarwal [Fri, 28 Oct 2016 20:01:58 +0000 (20:01 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Sanket Agarwal [Tue, 28 Jun 2016 03:13:54 +0000 (20:13 -0700)]
Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.
Bug: b/
29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit
dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit
40bb6f3f8fc02600fe24301c11e804196ced3531)
Igor Murashkin [Fri, 28 Oct 2016 18:00:11 +0000 (18:00 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555 am:
d0d99d8a3d
am:
4aa38633fe
Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3
Igor Murashkin [Fri, 28 Oct 2016 17:55:12 +0000 (17:55 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555
am:
d0d99d8a3d
Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
Igor Murashkin [Fri, 28 Oct 2016 17:48:15 +0000 (17:48 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
am:
4a4a8f1555
Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:19:57 +0000 (12:19 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88 am:
29d6af7fe7
am:
0cf19a9a27
Change-Id: I2e87d2f2a7484b6720152083299b1521f9c517bc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:15:19 +0000 (12:15 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88
am:
29d6af7fe7
Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9"
am:
ec3e884e88
Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Mitchell Wills [Fri, 28 Oct 2016 06:35:28 +0000 (06:35 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
a657136264
Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Fri, 28 Oct 2016 05:04:31 +0000 (05:04 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am:
77281bbaf4 -s ours
am:
e1d1740534
Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
Mitchell Wills [Fri, 28 Oct 2016 04:58:50 +0000 (04:58 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
77281bbaf4 -s ours
Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Jakub Pawlowski [Fri, 28 Oct 2016 03:01:56 +0000 (03:01 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21 am:
81d5ecb7a6
am:
61d0088923
Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
Jakub Pawlowski [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21
am:
81d5ecb7a6
Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
Marie Janssen [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours am:
98f664b903
am:
7ad32238f6
Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
Marie Janssen [Fri, 28 Oct 2016 02:52:00 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours
am:
98f664b903
Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
Jakub Pawlowski [Fri, 28 Oct 2016 02:50:54 +0000 (02:50 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
am:
87c997ca21
Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
Marie Janssen [Fri, 28 Oct 2016 02:45:26 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
am:
a062ce698b -s ours
Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
Fyodor Kupolov [Fri, 28 Oct 2016 00:40:22 +0000 (00:40 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0 am:
74bd9b1f56
am:
9b006e28f9
Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
Fyodor Kupolov [Fri, 28 Oct 2016 00:39:12 +0000 (00:39 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6 am:
7c9a91094d
am:
c9102f2ae2
Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
Fyodor Kupolov [Fri, 28 Oct 2016 00:31:47 +0000 (00:31 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0
am:
74bd9b1f56
Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
Fyodor Kupolov [Fri, 28 Oct 2016 00:30:43 +0000 (00:30 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6
am:
7c9a91094d
Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:12 +0000 (00:21 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
am:
e97969b4d0
Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:10 +0000 (00:21 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified
am:
b87a491de6
Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
TreeHugger Robot [Fri, 28 Oct 2016 00:11:11 +0000 (00:11 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
Jakub Pawlowski [Thu, 27 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Jakub Pawlowski [Wed, 26 Oct 2016 20:05:30 +0000 (13:05 -0700)]
Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.
Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.
bug:
28715749
Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit
ac69be543f89ea6e9a27204492e0a170d9b3450e)
Fyodor Kupolov [Thu, 27 Oct 2016 01:36:57 +0000 (18:36 -0700)]
[DO NOT MERGE] Only setSize if -s arg is specified
Calculate size of installed APKs only when INSTALL_EXTERNAL flag is set.
calculateInstalledSize is expensive and may take up to 20% of total
installation time.
Bug:
32180551
Bug:
29932779
Change-Id: I173d2b38820cc86cbfacecd1bacef57369d10af7
Jeff Sharkey [Thu, 27 Oct 2016 20:38:54 +0000 (20:38 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221 am:
32dcd2cad4
am:
99bfb0dcaa
Change-Id: I24fd77665875ef2f7e2ad231c7de8acabc40a99a
Jeff Sharkey [Thu, 27 Oct 2016 20:37:32 +0000 (20:37 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d am:
eeac5a064d
am:
f46b2eeab6
Change-Id: If4c4ab8ddd7e15a93de6422d8724077f158b1047
Jeff Sharkey [Thu, 27 Oct 2016 20:28:44 +0000 (20:28 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221
am:
32dcd2cad4
Change-Id: Iebf13cac5308c3763c90219407437a5d010cd27e
Jeff Sharkey [Thu, 27 Oct 2016 20:27:54 +0000 (20:27 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d
am:
eeac5a064d
Change-Id: If0fcf46d1f73662dbc774403e8d9be62585ef4a5
Jeff Sharkey [Thu, 27 Oct 2016 20:23:26 +0000 (20:23 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev
am:
286f069221
Change-Id: Ie24d27d010b355896e92b911d574576f42417b9b
Jeff Sharkey [Thu, 27 Oct 2016 20:23:23 +0000 (20:23 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once.
am:
7765d7320d
Change-Id: I2ca3b6d7938a461a6fe2d591b74985908c2d07bc
Michael Kwan [Thu, 27 Oct 2016 20:20:07 +0000 (20:20 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am:
07192ff60a
am:
4e830d259a
Change-Id: Iaaa3618b497ec0d547f83e3b5677fd322f7015b3
Michael Kwan [Thu, 27 Oct 2016 20:19:03 +0000 (20:19 +0000)]
Update progress bar and progress dialog to match UX specs for watch. am:
f930e5b99b
am:
c8eb232ba3
Change-Id: I56297d399965b2b03dc41b2cc9d6237c7762c03f
Jeff Sharkey [Thu, 27 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev
Michael Kwan [Thu, 27 Oct 2016 20:14:07 +0000 (20:14 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev
am:
07192ff60a
Change-Id: I31c220c68e142cb15b7e6801a88a1aff853229b2
Michael Kwan [Thu, 27 Oct 2016 20:13:59 +0000 (20:13 +0000)]
Update progress bar and progress dialog to match UX specs for watch.
am:
f930e5b99b
Change-Id: I5123bba1819fe4841184bcab9cc65d0418c3b2a5
TreeHugger Robot [Thu, 27 Oct 2016 20:06:15 +0000 (20:06 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev
Leonard Mosescu [Thu, 27 Oct 2016 17:39:59 +0000 (17:39 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master am:
258790a2ea
am:
df87eb4adc
Change-Id: Iafeb38ea7de7b233914e2abc8a251061921bf62a
Leonard Mosescu [Thu, 27 Oct 2016 17:39:07 +0000 (17:39 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours am:
d73688521c
am:
8d0cdfb291
Change-Id: I18ce0a2d49ab95c89e8318d009112f3c126b58ad
Michal Karpinski [Thu, 27 Oct 2016 17:38:18 +0000 (17:38 +0000)]
Extending DNS event reporting am:
6e54239e50
am:
8c32fd2d33
Change-Id: Ia12eb058152589c62e541f6198880f7ce421023c
Leonard Mosescu [Thu, 27 Oct 2016 17:29:24 +0000 (17:29 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
am:
258790a2ea
Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959
Leonard Mosescu [Thu, 27 Oct 2016 17:29:19 +0000 (17:29 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours
am:
d73688521c
Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992
Michal Karpinski [Thu, 27 Oct 2016 17:28:15 +0000 (17:28 +0000)]
Extending DNS event reporting
am:
6e54239e50
Change-Id: I64e6a48fbbaa734447069b073c3499ef71af907c
Android Build Merger (Role) [Thu, 27 Oct 2016 17:24:53 +0000 (17:24 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
Leonard Mosescu [Thu, 27 Oct 2016 17:24:17 +0000 (17:24 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am:
bd2688f4c3 -s ours
Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9
Leonard Mosescu [Thu, 27 Oct 2016 17:04:57 +0000 (17:04 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
Leonard Mosescu [Fri, 7 Oct 2016 00:32:05 +0000 (17:32 -0700)]
Adding "attach-agent" to ActivityManagerShellCommand
This new command is used to attach runtime agents to a running application:
attach-agent <PROCESS> <FILE>
Attach an agent to the specified <PROCESS>,
which may be either a process name or a PID.
Test: m test-art-host, manual testing:
. invalid syntax, missing arguments
. invalid syntax, extra arguments
. invalid numeric PID
. invalid process name
. valid process, not debuggable
. valid process, missing agent
. valid process, valid agent
Bug:
31682382
Change-Id: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Merged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
Bug:
29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
(cherry picked from commit
14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
Lorenzo Colitti [Thu, 27 Oct 2016 13:38:34 +0000 (13:38 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2 am:
853427a30a
am:
57ee5d7e9c
Change-Id: I4f38e704b362fb42c9a8704dee8b1b963008e55e
Michal Karpinski [Thu, 27 Oct 2016 13:31:09 +0000 (13:31 +0000)]
Add connect event reporting am:
265494a0f8 am:
17be4d6c85
am:
8fba923d2a
Change-Id: I20bca735eba409fe17c8c1bbec1bce20a1ca0723
Lorenzo Colitti [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2
am:
853427a30a
Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77
Michal Karpinski [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Extending DNS event reporting am:
f82d1596ce am:
3156b53fbe
am:
c1ca63e8cb
Change-Id: I5c3a43d9835900e849da6db2a895c0131f19d538
OSDN Git Service
