Commit Graph

11477 Commits

Author SHA1 Message Date
Robert Snoeberger
134a43b854 Merge "Implemented the mechanism of hiding clock face based on phenotype flag." into qt-r1-dev am: 33ce8f47c9
am: 7200d618aa

Change-Id: Id1d018bdd17cc0442d0003555ca9fa1e124ca510
2019-05-31 12:08:38 -07:00
Robert Snoeberger
7200d618aa Merge "Implemented the mechanism of hiding clock face based on phenotype flag." into qt-r1-dev
am: 33ce8f47c9

Change-Id: I1e263765bd615d69283cf5015735593fd28d6f1a
2019-05-31 11:49:45 -07:00
Robert Snoeberger
33ce8f47c9 Merge "Implemented the mechanism of hiding clock face based on phenotype flag." into qt-r1-dev 2019-05-31 18:38:59 +00:00
TreeHugger Robot
8507a2a8eb Merge "Correctly handle AndroidFuture#cancel" 2019-05-30 18:35:24 +00:00
lumark
eb21f317a0 Merge "Skip IME initialization when received the token that already registered" into qt-dev am: 9bb2607703 am: 5846614ff1
am: e1af2ac64d

Change-Id: I1cd7c9d1a11029a8c25987badf7581fe3e02bfbc
2019-05-30 11:22:08 -07:00
lumark
e1af2ac64d Merge "Skip IME initialization when received the token that already registered" into qt-dev am: 9bb2607703
am: 5846614ff1

Change-Id: I76c497ddc7caedb2217b3cdddaf53d0fcfa5a9df
2019-05-30 10:54:41 -07:00
lumark
5846614ff1 Merge "Skip IME initialization when received the token that already registered" into qt-dev
am: 9bb2607703

Change-Id: I9746ca99bc03a83beb6549605394b6760d48b835
2019-05-30 10:44:20 -07:00
lumark
9992e08829 Merge "Skip IME initialization when received the token that already registered" into qt-dev
am: 9bb2607703

Change-Id: I47e3521b214d5b5e057c979dfe8d96696bd42009
2019-05-30 10:44:19 -07:00
TreeHugger Robot
9bb2607703 Merge "Skip IME initialization when received the token that already registered" into qt-dev 2019-05-30 17:33:17 +00:00
lumark
e0af39403e Skip IME initialization when received the token that already registered
When IME window switches from current display to another display and back quickly,
system will re-bind InputMethodService to re-attach window token for each moving,
the IME service lifecycle will be onBind -> onUnBind -> onDestroy -> onBind.

Ideally, system will deliver window token when onServiceConnected and system should
only receive one onServiceConnected when the last service bound.

But due to user switch display very quick, before unbind service callbacked from client,
the next bind service request comes, caused the connection exists in system side and
client will then callback 2 onServiceConnected to system.

Since CL [1] introduced InputMethodPrivilegedOperationsRegistry to deal with token
registraction singleton-ness, the exception will be thrown for above case due to
the duplicate window token passed to client.

Add InputMethodPrivilegedOperationsRegistry#isRegistered to check if the token
already registered, if so, skip this duplicate initialization request.

[1]: I4a61470f06ffac5f7a512536f8431489db0108f4

Fix: 133624278
Test: manual as below steps:
    1) Settings > Developer options, enable "Simulated display" & "force desktop mode"
    2) Reboot device.
    3) Launch app from simulated display.
    4) Launch app from primary display (i.e. contacts), focus EditText to show IME.
    5) Tapping primary & simulated display repeatly & quickly.
    6) See if any exception log from IME application. (i.e. Gboard)

Change-Id: Ie6bfbae735724fe744590e715124d2737d2b665d
2019-05-30 12:27:17 +08:00
Govinda Wasserman
44cff3f5c6 Adds learned state to the Reminder Experience for Assistant Handles am: 1f606b099e am: c69727d509
am: 7c524a88f7

Change-Id: Ieeac0f5c14de370b5a5faba31c39371b7a4345dc
2019-05-29 20:52:03 -07:00
Govinda Wasserman
7c524a88f7 Adds learned state to the Reminder Experience for Assistant Handles am: 1f606b099e
am: c69727d509

Change-Id: I9b5f85256d2655570d7a13413dc35f5914f4c31c
2019-05-29 20:47:03 -07:00
Govinda Wasserman
7359be82e0 Adds learned state to the Reminder Experience for Assistant Handles
am: 1f606b099e

Change-Id: I674839782e711bd6b909ebdc8d126948ea492060
2019-05-29 20:42:02 -07:00
Govinda Wasserman
c69727d509 Adds learned state to the Reminder Experience for Assistant Handles
am: 1f606b099e

Change-Id: I9e23630e82a3cc4a060f906d9892cee148f522eb
2019-05-29 20:42:00 -07:00
shawnlin
f443938d56 Implemented the mechanism of hiding clock face based on phenotype flag.
Created a string type of phenotype flag which contains the clock plugin
service names that are not allow to be shown. Each service name is
seperated by a comma(",").

Test: atest com.android.keyguard.clock.ClockManagerTest
Bug: 133406302
Change-Id: I51c00b03ec56eaf4de7cab91073deeeb73610f93
2019-05-30 11:06:26 +08:00
Govinda Wasserman
1f606b099e Adds learned state to the Reminder Experience for Assistant Handles
Also sets the Reminder Experience as the default behavior.

Test: Tested locally
BUG:132983599
Change-Id: I27b063ca142fbde99b0bd1f6d107f45d6070869a
2019-05-29 23:06:02 -04:00
Eugene Susla
78e6b493a1 Correctly handle AndroidFuture#cancel
Also fixes AndroidFuture#completeExceptionally return result

Test: presubmit
Change-Id: I6c1cdb69c89829f41efb59472e925b526801a524
2019-05-29 17:30:14 -07:00
Govinda Wasserman
ec0e204a85 Merge "Update assist handle behavior control" into qt-dev am: f8e7608263 am: 5415f8171a
am: bdd0f0ca49

Change-Id: I3793f62ac0be8a6076fc8b869d9fa253a68e3e39
2019-05-29 13:56:37 -07:00
Govinda Wasserman
bdd0f0ca49 Merge "Update assist handle behavior control" into qt-dev am: f8e7608263
am: 5415f8171a

Change-Id: Ic76013e56887dbd8d26b52623f792753e9302d85
2019-05-29 13:45:48 -07:00
Govinda Wasserman
c77e6895e5 Merge "Update assist handle behavior control" into qt-dev
am: f8e7608263

Change-Id: I8fe5c7a89c0773de83329fac26d10d8a4215eae6
2019-05-29 13:41:30 -07:00
Govinda Wasserman
5415f8171a Merge "Update assist handle behavior control" into qt-dev
am: f8e7608263

Change-Id: Ic6e818a15976a12ccd5e9c465816c07ec237fdd0
2019-05-29 13:41:28 -07:00
TreeHugger Robot
f8e7608263 Merge "Update assist handle behavior control" into qt-dev 2019-05-29 20:34:48 +00:00
Mehdi Alizadeh
54cf997f16 Merge "Filter disabled/suspended direct share targets in sharesheet" into qt-dev am: 8a09c7c0ae am: cdc1153d95
am: 993727e5de

Change-Id: I9717927e9666db66deef85f2868b4ae26e58f7f7
2019-05-29 11:49:45 -07:00
Govinda Wasserman
2c1134052e Update assist handle behavior control
Improves behavior modes to use more reliable callback mechanisms. Added
phenotype flag hooks for control of behavior and behavior parameters.
Added more robust null guarding.

Test: Tested locally
BUG:132983599
Change-Id: I42039152836071941d6b4f1cafb3670c62a65824
2019-05-29 14:41:23 -04:00
Mehdi Alizadeh
993727e5de Merge "Filter disabled/suspended direct share targets in sharesheet" into qt-dev am: 8a09c7c0ae
am: cdc1153d95

Change-Id: I696e45d4bc4f5de593c431b149a84a2f187737ef
2019-05-29 11:36:52 -07:00
Mehdi Alizadeh
cdc1153d95 Merge "Filter disabled/suspended direct share targets in sharesheet" into qt-dev
am: 8a09c7c0ae

Change-Id: I57f9b54efa599a5bbf402313649153bf7337ae86
2019-05-29 11:27:00 -07:00
Mehdi Alizadeh
89b397be2d Merge "Filter disabled/suspended direct share targets in sharesheet" into qt-dev
am: 8a09c7c0ae

Change-Id: Icf53f2d5b2bf4196a3779c6238ca542d11ba95d1
2019-05-29 11:26:33 -07:00
Mehdi Alizadeh
8a09c7c0ae Merge "Filter disabled/suspended direct share targets in sharesheet" into qt-dev 2019-05-29 18:06:57 +00:00
Matt Pietal
1e0725b8e8 Merge "Sharesheet - Fix NPE on default app launch" into qt-dev am: b5fbf20a55 am: aed9a62d7f
am: 5dfeafbd0d

Change-Id: Id6290a0d0db2c9cde4960e2bc1e8745407b6db71
2019-05-29 10:35:11 -07:00
Varun Anand
aa200e2478 Merge changes from topic "vpn_data_accounting" into qt-dev am: b33d2ca2e3 am: ebf59f07b1
am: a6cd7d86a0

Change-Id: I87e704d91803c20313b61403a4cc2ee0a10cec95
2019-05-29 10:18:57 -07:00
Matt Pietal
5dfeafbd0d Merge "Sharesheet - Fix NPE on default app launch" into qt-dev am: b5fbf20a55
am: aed9a62d7f

Change-Id: I30499ca35f3f3d04d1696c50e9b7b0e8f153ec73
2019-05-29 10:11:29 -07:00
Matt Pietal
17d673a6f6 Merge "Sharesheet - Fix NPE on default app launch" into qt-dev
am: b5fbf20a55

Change-Id: I9806cbfd3391b2ce72f3c9996ef8308dd012b358
2019-05-29 10:06:42 -07:00
Matt Pietal
aed9a62d7f Merge "Sharesheet - Fix NPE on default app launch" into qt-dev
am: b5fbf20a55

Change-Id: I90a755ccac6a638542e52093c0af75dea51e0b8c
2019-05-29 10:05:22 -07:00
Varun Anand
a6cd7d86a0 Merge changes from topic "vpn_data_accounting" into qt-dev am: b33d2ca2e3
am: ebf59f07b1

Change-Id: If6da5cd1c88b57dd0331f704025109f419c9ea21
2019-05-29 09:55:36 -07:00
TreeHugger Robot
b5fbf20a55 Merge "Sharesheet - Fix NPE on default app launch" into qt-dev 2019-05-29 16:53:48 +00:00
Varun Anand
dadc3c9da4 Merge changes from topic "vpn_data_accounting" into qt-dev
am: b33d2ca2e3

Change-Id: Ie336c7c3968dd8cbb2b303398620632681d516b6
2019-05-29 09:47:38 -07:00
Varun Anand
ebf59f07b1 Merge changes from topic "vpn_data_accounting" into qt-dev
am: b33d2ca2e3

Change-Id: I234eb2b20f47bde94b4aba89867e9d1c7e9ee7d5
2019-05-29 09:44:04 -07:00
Varun Anand
b33d2ca2e3 Merge changes from topic "vpn_data_accounting" into qt-dev
* changes:
  Add one more test for VPN usage stats.
  Addressing comments for http://ag/7700679.
  NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
  Take all VPN underlying networks into account when migrating traffic for VPN uid.
2019-05-29 16:34:14 +00:00
Matt Pietal
8554249e3f Sharesheet - Add additional checks for low ram devices am: 030bd8471f am: fab9e188e0
am: db4b8263cf

Change-Id: I62d28e015b24ef5ed3ae50614ce95e59ed073461
2019-05-29 06:26:24 -07:00
Matt Pietal
db4b8263cf Sharesheet - Add additional checks for low ram devices am: 030bd8471f
am: fab9e188e0

Change-Id: I45b5e61d1ff4ea201e3c108d7537db53d755c8b2
2019-05-29 06:22:20 -07:00
Matt Pietal
fab9e188e0 Sharesheet - Add additional checks for low ram devices
am: 030bd8471f

Change-Id: I23f2fd79c87d384c26df65e454751fc54b1dda2b
2019-05-29 06:18:22 -07:00
Matt Pietal
97a04f921a Sharesheet - Add additional checks for low ram devices
am: 030bd8471f

Change-Id: I240b000807df5617dbf2320cfa6f2c917d37b0a6
2019-05-29 06:18:20 -07:00
Matt Pietal
32922ca4db Sharesheet - Fix NPE on default app launch
Turns out there's a secondary layout used by resolver which does not
contain R.id.empty. Check for null.

Bug: 133707284
Test: Open PDF file through resolver
Change-Id: I311f1c1d2fa6edcebc81d9056755884b1585a7cb
2019-05-29 07:39:21 -04:00
Matt Pietal
030bd8471f Sharesheet - Add additional checks for low ram devices
Continue to hide the direct share area for low ram devices. Make sure
the A-Z list loads properly.

Bug: 132342311
Test: Use low ram device
Change-Id: I66b58af3994e034e4d870286ef62ba4a9289e083
2019-05-29 07:17:39 -04:00
Varun Anand
917327b193 Take all VPN underlying networks into account when migrating traffic for
VPN uid.

(cherry picked from commit 95aa6d446f)

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: Manually verified on device that stats from VPN UID are moved
      appropriately based on its declared underlying network set.
Test: vogar --mode app_process --benchmark NetworkStatsBenchmark.java

Change-Id: I7f368c5970b2dcb969fe0daf5ef44edb1f51d09d
2019-05-29 18:15:17 +09:00
Matt Pietal
fb59e64f43 Merge "Sharesheet - Load images off main thread" into qt-dev am: a11f79120b am: 5e3a1c803f
am: 02d400de9d

Change-Id: I26a9e55e1c628a47cb08205d06b008b9926b58df
2019-05-28 12:58:53 -07:00
Matt Pietal
02d400de9d Merge "Sharesheet - Load images off main thread" into qt-dev am: a11f79120b
am: 5e3a1c803f

Change-Id: I03d8b765fd3d61ee6af7db2b02f077adaf3ced20
2019-05-28 12:46:13 -07:00
Matt Pietal
5e3a1c803f Merge "Sharesheet - Load images off main thread" into qt-dev
am: a11f79120b

Change-Id: I29f90d74f68205a4b1fc858846aed13420396e5d
2019-05-28 12:41:15 -07:00
Matt Pietal
227305d6a9 Merge "Sharesheet - Load images off main thread" into qt-dev
am: a11f79120b

Change-Id: I4288cd0a0223858681d8c836b5f01622b606d157
2019-05-28 12:40:51 -07:00
Matt Pietal
a11f79120b Merge "Sharesheet - Load images off main thread" into qt-dev 2019-05-28 19:28:41 +00:00