OSDN Git Service
Felipe Leme [Mon, 2 Oct 2017 19:00:58 +0000 (19:00 +0000)]
Merge "FIxed typo." into oc-mr1-dev
am:
683064f605
Change-Id: I445af6174e7f9b0d35e26a6b33feb925e3bc3f66
TreeHugger Robot [Mon, 2 Oct 2017 18:46:30 +0000 (18:46 +0000)]
Merge "FIxed typo." into oc-mr1-dev
Karthik Ravi Shankar [Mon, 2 Oct 2017 18:32:28 +0000 (18:32 +0000)]
Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev
am:
488665d9e3
Change-Id: Ia6d5cfffb8dddf2603a73ae88212fc7353948d67
TreeHugger Robot [Mon, 2 Oct 2017 18:13:04 +0000 (18:13 +0000)]
Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev
Bill Yi [Mon, 2 Oct 2017 18:08:12 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours am:
899f5cf309 -s ours
am:
79ef7d950d -s ours
Change-Id: If943b496bc5845af3aecb339b80f4c63ee62d32f
Android Build Merger (Role) [Mon, 2 Oct 2017 18:02:41 +0000 (18:02 +0000)]
Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am:
dab9eff899" into oc-mr1-dev-plus-aosp
Dan Sandler [Mon, 2 Oct 2017 18:00:56 +0000 (18:00 +0000)]
Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev
am:
dab9eff899
Change-Id: Idfc6a98804928a177153492010e04ec75fa30755
Bill Yi [Mon, 2 Oct 2017 17:59:13 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours am:
899f5cf309 -s ours
am:
c260f7c6bb -s ours
Change-Id: I930d8e7a4ad3f4fcea358235574b6698dede8772
Bill Yi [Mon, 2 Oct 2017 17:51:45 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours
am:
899f5cf309 -s ours
Change-Id: I79586b1902cfed6baa9db8d615e94b4fadab4740
Bill Yi [Mon, 2 Oct 2017 17:51:36 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
995627c3ee -s ours
am:
899f5cf309 -s ours
Change-Id: Ia3d156d8da37e54364775285658dbdfd4f176468
Bill Yi [Mon, 2 Oct 2017 17:51:14 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
2174056518 -s ours
Change-Id: Id5f7695856db3b6f19dec85ed716a77775ceb346
Bill Yi [Mon, 2 Oct 2017 17:45:18 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
995627c3ee -s ours
Change-Id: I1acc544f6cab8fdde4d7b66b110baf46114a3730
TreeHugger Robot [Mon, 2 Oct 2017 17:44:57 +0000 (17:44 +0000)]
Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 17:41:52 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 17:33:24 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Mon, 2 Oct 2017 17:24:31 +0000 (17:24 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours am:
595adddf1c -s ours
am:
d4c920df48 -s ours
Change-Id: Ie86e5745b7212bb12f7378fe237e636a081ac185
Bill Yi [Mon, 2 Oct 2017 17:20:05 +0000 (17:20 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours am:
595adddf1c -s ours
am:
1949b69ddf -s ours
Change-Id: Ied0f338cf53533c3f135f5372f55fa5a5fd0e58e
Bill Yi [Mon, 2 Oct 2017 17:12:06 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours
am:
595adddf1c -s ours
Change-Id: Iacfa5b853c7c7c091a06e4c06e20bfbe24c8adf7
Bill Yi [Mon, 2 Oct 2017 17:12:04 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours
am:
595adddf1c -s ours
Change-Id: Ia591f2b47dffdeb12b471c4236e2f8e512cb8ffc
Bill Yi [Mon, 2 Oct 2017 17:05:03 +0000 (17:05 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours
am:
a77aa847f8 -s ours
Change-Id: Iad25d5ad2bdda26aba5a49bf7a118d86d8eb0b2d
Bill Yi [Mon, 2 Oct 2017 16:54:38 +0000 (16:54 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours
am:
a8c4c7aa94 -s ours
Change-Id: I6485896b6b814d124c5a7a7b69e0e0a5910a383b
Bill Yi [Mon, 2 Oct 2017 16:47:00 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE
am:
45de16dde5 -s ours
Change-Id: Idaa0738ef0b990ef955a0f6c55c7a0905739439a
Eric Laurent [Mon, 2 Oct 2017 15:44:35 +0000 (15:44 +0000)]
Merge "AudioService: more logs for audio mode changes" into oc-mr1-dev
am:
3e038bd4d6
Change-Id: I900b28cf8f0abd3ac57f99b7761d48e68f046541
TreeHugger Robot [Mon, 2 Oct 2017 15:34:47 +0000 (15:34 +0000)]
Merge "AudioService: more logs for audio mode changes" into oc-mr1-dev
Bill Yi [Mon, 2 Oct 2017 11:16:10 +0000 (04:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I35ffe572de6f4cf7b2d871bae713da183300b353
Hugo Benichi [Mon, 2 Oct 2017 11:10:37 +0000 (11:10 +0000)]
Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev
am:
9d5f50a9f8
Change-Id: I0236132b8b497af5b1c26aa44e6494fe0510cb6d
Hugo Benichi [Mon, 2 Oct 2017 10:57:01 +0000 (10:57 +0000)]
Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev
Hugo Benichi [Mon, 2 Oct 2017 10:51:21 +0000 (10:51 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am:
1211941aa0 am:
0d506fc4f4
am:
eced6cd14a
Change-Id: I53d0d6755c8e0be34db66da56efa483006e538ac
Hugo Benichi [Mon, 2 Oct 2017 10:44:51 +0000 (10:44 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am:
1211941aa0
am:
0d506fc4f4
Change-Id: I630392c4c7dbfd52bf3378f9435cf0cb5b328f6a
Hugo Benichi [Mon, 2 Oct 2017 10:36:22 +0000 (10:36 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
am:
1211941aa0
Change-Id: I169e1d48bffab3326dd61011b7747c1400b9bc74
Treehugger Robot [Mon, 2 Oct 2017 10:24:48 +0000 (10:24 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
Bill Yi [Mon, 2 Oct 2017 08:57:00 +0000 (01:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I78f2a4cfa2cd99a1ca3f8fb25bea13e286b6275e
Hugo Benichi [Fri, 29 Sep 2017 00:34:08 +0000 (09:34 +0900)]
ConnectivityServiceTest: fix flaky testNetworkRequestMaximum
Registered requests are not keyed by PendingIntents in
ConnectivityService, which means that unregistering a request with a
PendingIntent causes a linear search in all registered requests.
testNetworkRequestMaximum was registering too many PendingIntents
simultaneously, causing the unregistration loop to have n^2
complexity and to take a long time to take effect.
To make the unregistering loop less likely to trigger a timeout on
waitForIdle, this patch changes the test to not register MAX_REQUEST
number of PendingIntent, but instead mixes a small number of
PendingIntents with NetworkCallbacks to reach MAX_REQUEST number of
simultaneously registered requests.
When unregistering these requests, callbacks are unregistered first.
Bug:
32561414
Test: runtest frameworks-net
Change-Id: I48b882c884abe20b388190b7f28baee293446f37
Hugo Benichi [Sat, 30 Sep 2017 13:17:07 +0000 (22:17 +0900)]
DO NOT MERGE Ignore DUN in describeImmutableDifferences
This patch changes describeImmutableDifferences in NetworkCapabilities
to ignore differences in NET_CAPABILITY_DUN, so that updateCapabilities
in ConnectivityService to not report wtf errors when a NetworkAgent
degrades its NetworkCapabilities object by removing NET_CAPABILITY_DUN.
Bug:
65257223
Test: runtest frameworks-net
Change-Id: I115ed1b366da01a3f8c3c6e97e0db8ce995fd377
Bill Yi [Mon, 2 Oct 2017 04:27:23 +0000 (21:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ca153d375ff59721c164c9841f7c873aaa562fc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Guang Zhu [Sun, 1 Oct 2017 02:51:42 +0000 (02:51 +0000)]
Merge "revamp app compat test harness" into oc-mr1-dev
am:
41c78dbd9e
Change-Id: Ifab3c9106f323b1e5e1d12a9b0f50dc00aeb3a88
TreeHugger Robot [Sun, 1 Oct 2017 02:38:22 +0000 (02:38 +0000)]
Merge "revamp app compat test harness" into oc-mr1-dev
Guang Zhu [Fri, 29 Sep 2017 01:11:19 +0000 (18:11 -0700)]
revamp app compat test harness
- migrate away from deprecated JUnit3 paradigm
- scan dropbox entries for app errors, instead of probing
task list
- use IActivityController to suppress crash dialogs and record
detected app errors
- use combined dropbox and activity controller detected errors
to determine app errors
Bug:
67002148
Test: run harness against apps known to crash
Change-Id: If108cfdc7474a13e24f0d8350a7cbf99e3b51c46
Hansong Zhang [Sat, 30 Sep 2017 05:05:28 +0000 (05:05 +0000)]
Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804
am:
45f17f4533
Change-Id: I2a972a4ea474e2ef9462519a7b333a6e64cfff70
Hansong Zhang [Sat, 30 Sep 2017 04:58:48 +0000 (04:58 +0000)]
Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc
am:
849805b804
Change-Id: I17a5fd3eac7366f8e721419cafea6e79c98b50c5
Hansong Zhang [Sat, 30 Sep 2017 04:48:28 +0000 (04:48 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
am:
d30e47ecfc
Change-Id: Ibd3c731781359861d89a7f396ead2f9a7b377821
Hansong Zhang [Sat, 30 Sep 2017 04:35:54 +0000 (04:35 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
Android Build Merger (Role) [Sat, 30 Sep 2017 03:51:56 +0000 (03:51 +0000)]
Merge "Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours am:
9b3559aee9 am:
eee38701b5 am:
055acca2ed" into oc-mr1-dev-plus-aosp
Siyamed Sinir [Sat, 30 Sep 2017 03:50:01 +0000 (03:50 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours am:
9b3559aee9 am:
eee38701b5
am:
055acca2ed
Change-Id: I298fd9324e44653f22ea499015d4aee432412754
Siyamed Sinir [Sat, 30 Sep 2017 03:45:58 +0000 (03:45 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours am:
9b3559aee9 am:
eee38701b5
am:
7c6ff9062b
Change-Id: Iebda41560686e08a73d54da697258bf2e226e813
Siyamed Sinir [Sat, 30 Sep 2017 03:37:39 +0000 (03:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours am:
9b3559aee9
am:
eee38701b5
Change-Id: Id0ce1ee8cebf5c5968188e918da57849f2ffd3c6
Siyamed Sinir [Sat, 30 Sep 2017 03:37:38 +0000 (03:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours am:
9b3559aee9
am:
eee38701b5
Change-Id: Ibd90487722439a578841ffde90a2731cf10f57a3
Siyamed Sinir [Sat, 30 Sep 2017 03:26:08 +0000 (03:26 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours
am:
9b3559aee9
Change-Id: I85c08a27dc190d7c6710fd2b928d8e018d08ede8
Siyamed Sinir [Sat, 30 Sep 2017 03:19:36 +0000 (03:19 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959
am:
36153a9689 -s ours
Change-Id: I341930f4f2195705ec0ddcef29e807602f93f98b
Siyamed Sinir [Sat, 30 Sep 2017 02:32:18 +0000 (02:32 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am:
8155446b77 am:
8c8e5ce966
am:
a5b525bd98
Change-Id: I9c861e58b5dc7c1d6ba95e5e3880a0a3d7562c89
Siyamed Sinir [Sat, 30 Sep 2017 01:15:21 +0000 (01:15 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e
am:
7c7945c959
Change-Id: I0d4f109c2e73ee7088bb8b77eba563d60ee0113f
Siyamed Sinir [Sat, 30 Sep 2017 01:07:30 +0000 (01:07 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137
am:
9865205a4e
Change-Id: I7c34d6b58d5aacadd6efa07ce12f9b7e9898768a
Siyamed Sinir [Sat, 30 Sep 2017 00:58:30 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a
am:
d93f91a137
Change-Id: If4bb2848e0df71257a1f7e162524ebd08a5dad4d
Siyamed Sinir [Sat, 30 Sep 2017 00:51:02 +0000 (00:51 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114
am:
17735f183a
Change-Id: I71795f8f2f454956797ffaa78d22ca3573e5d626
Siyamed Sinir [Sat, 30 Sep 2017 00:37:54 +0000 (00:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77
am:
85439e9114
Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86
Siyamed Sinir [Sat, 30 Sep 2017 00:28:19 +0000 (00:28 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307
am:
a4f6ca3e77
Change-Id: If3b713963f393b7a16352d03c28dced60e2df7db
Siyamed Sinir [Sat, 30 Sep 2017 00:22:03 +0000 (00:22 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c
am:
095eda9307
Change-Id: I4ff17f12c20f95efe68115cc3d6b7d5e9b47228c
Siyamed Sinir [Sat, 30 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile
am:
6d79675e0c
Change-Id: Icea573859a6d441e18665d9da855370582f2992a
Siyamed Sinir [Fri, 29 Sep 2017 23:46:20 +0000 (23:46 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am:
8155446b77 am:
8c8e5ce966
am:
c94e35c549
Change-Id: I80a018bd7ad39a6a9108e1dd5295bf39bf64e48b
Siyamed Sinir [Fri, 29 Sep 2017 23:40:15 +0000 (23:40 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am:
8155446b77
am:
8c8e5ce966
Change-Id: I0510692cbbb996b652cd6b0c2967d44c7e7b1fbf
Siyamed Sinir [Fri, 29 Sep 2017 23:36:56 +0000 (23:36 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am:
8155446b77
am:
8c8e5ce966
Change-Id: Ia6e606bbe766ae439c8285e2e573be98f512bca0
Siyamed Sinir [Fri, 29 Sep 2017 23:28:05 +0000 (23:28 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev
am:
8155446b77
Change-Id: I21712b3913ab073d1e0265bc8eb73d9fa33c032c
Abodunrinwa Toki [Fri, 29 Sep 2017 23:15:15 +0000 (23:15 +0000)]
Merge "Increase the duration allowed for a TC result." into oc-mr1-dev
am:
f85cd339c7
Change-Id: Idc9022fa7054fa70b1599910f23c2cce8714f321
Siyamed Sinir [Fri, 29 Sep 2017 23:15:06 +0000 (23:15 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev
TreeHugger Robot [Fri, 29 Sep 2017 23:08:50 +0000 (23:08 +0000)]
Merge "Increase the duration allowed for a TC result." into oc-mr1-dev
Sunny Goyal [Fri, 29 Sep 2017 23:06:57 +0000 (23:06 +0000)]
Merge "Fixing Launcher package name for privilege permission" into oc-mr1-dev
am:
22f7ae8d07
Change-Id: I0d397fbd620cf9ff9c281800fc5670c876fca815
TreeHugger Robot [Fri, 29 Sep 2017 22:58:21 +0000 (22:58 +0000)]
Merge "Fixing Launcher package name for privilege permission" into oc-mr1-dev
Rajeev Kumar [Fri, 29 Sep 2017 22:40:06 +0000 (22:40 +0000)]
Merge "Disable long-press home Orb animation." into oc-mr1-dev
am:
d81e99a963
Change-Id: I84ad575c63bbbbcacd15dfaa587503c788e67b69
TreeHugger Robot [Fri, 29 Sep 2017 22:28:15 +0000 (22:28 +0000)]
Merge "Disable long-press home Orb animation." into oc-mr1-dev
Stephen Chen [Fri, 29 Sep 2017 21:52:59 +0000 (21:52 +0000)]
Merge "Add Open Network Available metrics to wifi.proto" into oc-mr1-dev
am:
f93dfbd65f
Change-Id: I2ce650504bb699daa19b969f829e9b0e7c916f29
TreeHugger Robot [Fri, 29 Sep 2017 21:38:00 +0000 (21:38 +0000)]
Merge "Add Open Network Available metrics to wifi.proto" into oc-mr1-dev
Hansong Zhang [Wed, 27 Sep 2017 23:59:01 +0000 (16:59 -0700)]
Bluetooth HID Device: Fix a typo
Fixed a typo in BluetoothInputHost. "DIGITIZER_TABLED" should be
"DIGITIZER_TABLET".
Test: Not needed.
Change-Id: I06ffc536f5912d53319b4d325f77991d65ab04f2
Abodunrinwa Toki [Wed, 27 Sep 2017 01:38:55 +0000 (02:38 +0100)]
Increase the duration allowed for a TC result.
Increase the duration allowed for a TextClassifier (TC) result when
it is being initialized for the first time.
Initialization typically takes more time that other calls to the TC.
A timeout during initialization means the user doesn't see the
effect of running the TC the first time. Subsequent calls typically
work fine as they're less likely to timeout.
We increase this value only slightly because we don't want the user
waiting too long for a slow TC's result. Finding the right balance
is an art and most likely depends on the TC being used.
Note that although a TextView's TC can change for each individual
call to the TC, such a situation does not benefit from the bump in
the timeout. Again, we really want to discourage larger timeouts.
Fixes:
66217281
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: Manual test:
- Delayed TextClassifier response by about 150ms (allowing only 50ms for initialization)
- Before cl: Sometimes the result is not shown to the user the
first time the textclassifier runs
- After cl: Results consistently show for even for first
textclassifier call
Merged-In: Iabc8279fa57ef6a9a2db0c7e9c7e3ab8c131bf02
Change-Id: Iabc8279fa57ef6a9a2db0c7e9c7e3ab8c131bf02
Marco Nelissen [Fri, 29 Sep 2017 20:21:30 +0000 (20:21 +0000)]
Merge "AmrInputStream is not a public API" am:
c3b1442d52 am:
fa55320f5d
am:
9bda8fddf2
Change-Id: Ib6e7f401af259e422aee6ca7d18703f380ef08f6
Marco Nelissen [Fri, 29 Sep 2017 20:11:56 +0000 (20:11 +0000)]
Merge "AmrInputStream is not a public API" am:
c3b1442d52
am:
fa55320f5d
Change-Id: I44e4bbdb4919fa76bd47a25f4260ee943c9a6ecc
Sunny Goyal [Thu, 28 Sep 2017 21:15:30 +0000 (14:15 -0700)]
Fixing Launcher package name for privilege permission
Test: None
Bug:
67017745
Change-Id: I37b903c0c771e54a68bf4dac42a0ce39641b7933
Marco Nelissen [Fri, 29 Sep 2017 20:04:54 +0000 (20:04 +0000)]
Merge "AmrInputStream is not a public API"
am:
c3b1442d52
Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb
Treehugger Robot [Fri, 29 Sep 2017 19:50:37 +0000 (19:50 +0000)]
Merge "AmrInputStream is not a public API"
Bryce Lee [Fri, 29 Sep 2017 19:23:14 +0000 (19:23 +0000)]
Merge "Update configuration whenever the visible window is laid out." into oc-mr1-dev
am:
bbdc422bb1
Change-Id: If0e29f5c031300ce24dc7ed875c9050ec5f9679a
Bryce Lee [Fri, 29 Sep 2017 19:04:38 +0000 (19:04 +0000)]
Merge "Update configuration whenever the visible window is laid out." into oc-mr1-dev
Felipe Leme [Fri, 29 Sep 2017 18:40:34 +0000 (18:40 +0000)]
Merge "Fixed warning on getWebDomain()" into oc-mr1-dev
am:
256c2822f5
Change-Id: I4279400bd5a5ab441961942782054d5e810235c4
Chris Wren [Fri, 29 Sep 2017 18:35:23 +0000 (18:35 +0000)]
Merge "enable experiments for AOD timeout" into oc-mr1-dev
am:
6141d9e54d
Change-Id: I5d917114cc6bc1cf9ca885bc1c48f824d93383a7
TreeHugger Robot [Fri, 29 Sep 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Fixed warning on getWebDomain()" into oc-mr1-dev
Jason Monk [Fri, 29 Sep 2017 18:18:08 +0000 (18:18 +0000)]
Merge "Don't show no sim when a sim has been detected." into oc-mr1-dev
am:
dddbb2261c
Change-Id: Ic6154e7b2e10d8b538ca466f3cd38ded953a3dbd
TreeHugger Robot [Fri, 29 Sep 2017 18:09:36 +0000 (18:09 +0000)]
Merge "enable experiments for AOD timeout" into oc-mr1-dev
TreeHugger Robot [Fri, 29 Sep 2017 18:08:10 +0000 (18:08 +0000)]
Merge "Don't show no sim when a sim has been detected." into oc-mr1-dev
Erik Kline [Fri, 29 Sep 2017 17:16:37 +0000 (17:16 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling" am:
48c7d27f64 am:
b9b0886335
am:
a59b4d1568
Change-Id: I3f3f1aa7e57ea6311e91f88724a2ac3c3a6ee9c6
Marco Nelissen [Fri, 29 Sep 2017 17:15:34 +0000 (10:15 -0700)]
AmrInputStream is not a public API
and nobody should be using it. Add some warnings to that effect.
Change-Id: I8029ccd665fd147b4708a68f61c6aa055004a5c1
Felipe Leme [Tue, 26 Sep 2017 21:20:30 +0000 (14:20 -0700)]
Fixed warning on getWebDomain()
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML.
Bug:
66963249
Change-Id: If063961f41f297da1ed67e73616972f455edc117
Bryce Lee [Fri, 29 Sep 2017 15:35:42 +0000 (08:35 -0700)]
Update configuration whenever the visible window is laid out.
The configuration update during layout is currently restricted to
whether the client is hidden. This does not cover all the conditions
where the window can be laid out, such as if it is the starting
window.
This changelist makes sure the same condition is used in both cases.
Change-Id: I64a2f70718b949f3803e8cafcdabd2be5b5885e6
Fixes:
67027059
Test: Repeatedly open Gmail and ensure no jump-cut occurs.
Jason Monk [Fri, 29 Sep 2017 15:17:05 +0000 (11:17 -0400)]
Don't show no sim when a sim has been detected.
Instead indicate a lack of signal until we have a subscription to
tell us what to show.
Test: updated existing tests
Change-Id: I170f3782597584e5e761b5c9f9fce3cdbdc26a4f
Fixes:
65744290
Bryce Lee [Fri, 29 Sep 2017 14:46:30 +0000 (14:46 +0000)]
Merge "Reduce synchronized lock scope." into oc-mr1-dev
am:
9b6ef6a8f6
Change-Id: If3837cdad1238d7f8e7c20c9e9eedfe79bc47705
Bryce Lee [Fri, 29 Sep 2017 14:18:12 +0000 (14:18 +0000)]
Merge "Reduce synchronized lock scope." into oc-mr1-dev
Erik Kline [Fri, 29 Sep 2017 11:16:22 +0000 (11:16 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling" am:
48c7d27f64
am:
b9b0886335
Change-Id: Id543589394c230b657ac150ab8fd4b9e388283eb
Mathieu Chartier [Fri, 29 Sep 2017 10:24:49 +0000 (10:24 +0000)]
Merge "Add frameworks base config and move text blobs there" am:
34cf8b2c04 am:
0dae24ff44
am:
d1012721c4
Change-Id: I9f38fe070ad80e2e11469b133b1b24a986c0aa7d
Yifan Hong [Fri, 29 Sep 2017 09:59:20 +0000 (09:59 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed" am:
3e3e26305a am:
3d1214508b
am:
b07f2b92bc
Change-Id: Ic91d452eca713dd53cfc46103332fc02be06658e
Dan Willemsen [Fri, 29 Sep 2017 09:33:31 +0000 (09:33 +0000)]
Merge "Rename libz-host -> libz" am:
3e47510e0e am:
7190974801
am:
77a00d2b67
Change-Id: Id9f42f47e16eb9193cc9f41ab095b8c37ec1d8f3
Sungsoo Lim [Fri, 29 Sep 2017 08:43:07 +0000 (08:43 +0000)]
Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev
am:
6e326268c1
Change-Id: I91a4e5422a92f3e7571a1ffc7fb19d0594f116e2
Mathieu Chartier [Fri, 29 Sep 2017 08:34:43 +0000 (08:34 +0000)]
Merge "Add frameworks base config and move text blobs there" am:
34cf8b2c04
am:
0dae24ff44
Change-Id: Ie1c4ee3e50e804c41daf95ec8c65aa001ad4ffc0
Yifan Hong [Fri, 29 Sep 2017 08:23:11 +0000 (08:23 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed" am:
3e3e26305a
am:
3d1214508b
Change-Id: If4b8946c8a2169601a52f950260f3859e0f2ab49