OSDN Git Service
Bookatz [Tue, 9 May 2017 17:48:49 +0000 (17:48 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev am:
7080fa5282
am:
eb5a068cbc
Change-Id: I2e3bb04a7283d9aa64181e221462cff7b40839af
Android Build Merger (Role) [Tue, 9 May 2017 17:31:07 +0000 (17:31 +0000)]
Merge "Merge "Remove redundant TextClassificationService" into oc-dev am:
104590844e am:
41564af248"
Abodunrinwa Toki [Tue, 9 May 2017 17:26:01 +0000 (17:26 +0000)]
Merge "Remove redundant TextClassificationService" into oc-dev am:
104590844e
am:
41564af248
Change-Id: Ib7c77dd40de6c72bd843af680f59972708a4b121
Android Build Merger (Role) [Tue, 9 May 2017 17:25:31 +0000 (17:25 +0000)]
Merge "Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am:
3630fd4e11 am:
9cbe611f4a"
TreeHugger Robot [Tue, 9 May 2017 17:21:17 +0000 (17:21 +0000)]
Merge "Add system feature flag FEATURE_WIFI_PASSPOINT"
Rob Carr [Tue, 9 May 2017 17:14:05 +0000 (17:14 +0000)]
Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am:
3630fd4e11
am:
9cbe611f4a
Change-Id: I1b18f556b4b42f81ddca69ae5ce420d7a612bf6b
Phil Weaver [Tue, 9 May 2017 17:10:02 +0000 (17:10 +0000)]
Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev am:
8d25b77e4c
am:
bcc047ca4f
Change-Id: I7814872b4f530ed408587887225243a3fc1c59ce
Bookatz [Tue, 9 May 2017 17:08:03 +0000 (17:08 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
am:
7080fa5282
Change-Id: I8e485d5a97d46f6787b5b32c17ab5b85463f2653
Abodunrinwa Toki [Tue, 9 May 2017 16:59:38 +0000 (16:59 +0000)]
Merge "Remove redundant TextClassificationService" into oc-dev
am:
104590844e
Change-Id: Ib2881e478819eaff8910f5a0982e4f048e4bb7c1
Todd Kennedy [Tue, 9 May 2017 16:58:00 +0000 (16:58 +0000)]
Merge "Always throw a ConnectionException on error" into oc-dev am:
1c7445565d
am:
dbb567838b
Change-Id: Ia0a54bdbc11fee2f39a851546fde191055b55c3f
TreeHugger Robot [Tue, 9 May 2017 16:51:13 +0000 (16:51 +0000)]
Merge "Use static imports for constants."
Android Build Merger (Role) [Tue, 9 May 2017 16:50:31 +0000 (16:50 +0000)]
Merge "Merge "Fix crash in a11y cache" into oc-dev am:
64d6e3e11d am:
2af1fda3ca"
Phil Weaver [Tue, 9 May 2017 16:46:34 +0000 (16:46 +0000)]
Merge "Fix crash in a11y cache" into oc-dev am:
64d6e3e11d
am:
2af1fda3ca
Change-Id: Ib2aaaf46de7a402e34288ea9dcad45b9b2ba55eb
Lucas Dupin [Tue, 9 May 2017 16:42:06 +0000 (16:42 +0000)]
Merge "ColorExtractor available through Dependency"
Rob Carr [Tue, 9 May 2017 16:36:57 +0000 (16:36 +0000)]
Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev
am:
3630fd4e11
Change-Id: I8c841d11033c9bf18987b59edce0ccf93bb984b9
Phil Weaver [Tue, 9 May 2017 16:31:19 +0000 (16:31 +0000)]
Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev
am:
8d25b77e4c
Change-Id: If3d5182c2830b7a4a8e147426414ec16593ed229
Todd Kennedy [Tue, 9 May 2017 16:23:01 +0000 (16:23 +0000)]
Merge "Always throw a ConnectionException on error" into oc-dev
am:
1c7445565d
Change-Id: Ib80975794f05d97aec6c3bdc3639d113a7085f90
Phil Weaver [Tue, 9 May 2017 16:20:06 +0000 (16:20 +0000)]
Merge "Fix crash in a11y cache" into oc-dev
am:
64d6e3e11d
Change-Id: I86b25241a07ab47bc1c7e9a069867db90872ad4f
Android Build Merger (Role) [Tue, 9 May 2017 16:17:30 +0000 (16:17 +0000)]
Merge "Merge "Fix double bolding" into oc-dev am:
1b7e17b135 -s ours am:
e99f3c3c77 -s ours"
Seigo Nonaka [Tue, 9 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "Fix double bolding" into oc-dev am:
1b7e17b135 -s ours
am:
e99f3c3c77 -s ours
Change-Id: I4700cfb3a3b790c181bad48595831b85e9657a53
TreeHugger Robot [Tue, 9 May 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 16:02:10 +0000 (16:02 +0000)]
Merge "Remove redundant TextClassificationService" into oc-dev
Seigo Nonaka [Tue, 9 May 2017 15:57:00 +0000 (15:57 +0000)]
Merge "Fix double bolding" into oc-dev am:
1b7e17b135 -s ours
am:
e99f3c3c77 -s ours
Change-Id: Iabe234d3a1401c31f92d8477576230aad5a39946
Rob Carr [Tue, 9 May 2017 15:49:20 +0000 (15:49 +0000)]
Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev
Phil Weaver [Tue, 9 May 2017 15:35:54 +0000 (15:35 +0000)]
Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 15:32:22 +0000 (15:32 +0000)]
Merge "Always throw a ConnectionException on error" into oc-dev
Phil Weaver [Tue, 9 May 2017 15:30:24 +0000 (15:30 +0000)]
Merge "Fix crash in a11y cache" into oc-dev
Seigo Nonaka [Tue, 9 May 2017 15:25:34 +0000 (15:25 +0000)]
Merge "Fix double bolding" into oc-dev
am:
1b7e17b135 -s ours
Change-Id: Ia466856897b22565206c4cad88ff193b88bc0c42
TreeHugger Robot [Tue, 9 May 2017 15:23:15 +0000 (15:23 +0000)]
Merge "Fix cannot share text from twitter to managed profile"
TreeHugger Robot [Tue, 9 May 2017 15:13:48 +0000 (15:13 +0000)]
Merge "Fix double bolding" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 15:07:46 +0000 (15:07 +0000)]
Merge "Update Typeface_Delegate following Change Ied73189b"
Artem Iglikov [Tue, 9 May 2017 10:00:03 +0000 (11:00 +0100)]
Use static imports for constants.
This is an automated change with some manual formatting.
Bug:
36850431
Test: mmma frameworks/base
Change-Id: I126747e57ae1b666e5281b25d063d22d774b0718
Abodunrinwa Toki [Thu, 4 May 2017 15:29:04 +0000 (16:29 +0100)]
Remove redundant TextClassificationService
Text classification is now being done entirely in the app's proccess.
See android.view.textclassifier.TextClassificationManager
Reverts Ic428d00f291e268211866b3fc6b7acbc3eb04e1e
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Fixes:
36852122
Change-Id: Iffff3ab6e7d3b761576eb6bdcd5032db34b7a1b2
Jerome Gaillard [Tue, 9 May 2017 12:49:07 +0000 (13:49 +0100)]
Update Typeface_Delegate following Change Ied73189b
Test: layoutlib tests
Change-Id: I86ef9794751c6adb3f304ae6e00c5e24428da5dd
Rubin Xu [Tue, 9 May 2017 12:05:57 +0000 (12:05 +0000)]
Merge "Update SystemUpdatePolicy wording" into oc-dev am:
7cf5f74f3f
am:
0311911b9e
Change-Id: Ibaa5ed8533bfd36911aacd8738a0811b5a41d8cc
Rubin Xu [Tue, 9 May 2017 11:57:57 +0000 (11:57 +0000)]
Merge "Update SystemUpdatePolicy wording" into oc-dev
am:
7cf5f74f3f
Change-Id: Ifac890402f5f352d00ccb5eb3809b67a125d2b24
Rubin Xu [Tue, 9 May 2017 11:48:56 +0000 (11:48 +0000)]
Merge "Update SystemUpdatePolicy wording" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 11:28:39 +0000 (11:28 +0000)]
Merge "Disable flaky test"
Erik Kline [Tue, 9 May 2017 10:59:36 +0000 (10:59 +0000)]
Merge "Refactor and improve logging." am:
c3d41d5093 am:
8af8235bca am:
9f76683c59
am:
d1ea33a039
Change-Id: I744b048224e0b8bf6fe4da763833b755441c0911
Erik Kline [Tue, 9 May 2017 10:53:36 +0000 (10:53 +0000)]
Merge "Refactor and improve logging." am:
c3d41d5093 am:
8af8235bca
am:
9f76683c59
Change-Id: Ieb9a8e3f85f41d18056a7827997f12986ff13ca1
Paul Duffin [Tue, 9 May 2017 10:51:32 +0000 (10:51 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am:
b2ac85e76d am:
edefe593e3 am:
5d43c16797 -s ours
am:
a0297e34dd -s ours
Change-Id: Idd9d7ffc96e37e4d31ac0ba11a6ab819912d9f15
Erik Kline [Tue, 9 May 2017 10:47:03 +0000 (10:47 +0000)]
Merge "Refactor and improve logging." am:
c3d41d5093
am:
8af8235bca
Change-Id: Id583ab11513ab86f85d1c4001cf36e74fc521753
Paul Duffin [Tue, 9 May 2017 10:45:05 +0000 (10:45 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am:
b2ac85e76d am:
edefe593e3
am:
5d43c16797 -s ours
Change-Id: I077e5c803f06c2ae994514850ee64c18a57a81eb
Erik Kline [Tue, 9 May 2017 10:40:29 +0000 (10:40 +0000)]
Merge "Refactor and improve logging."
am:
c3d41d5093
Change-Id: I8ef193a9ee0f5bf04ae18620c1a68228ed7ed929
Paul Duffin [Tue, 9 May 2017 10:36:03 +0000 (10:36 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am:
b2ac85e76d
am:
edefe593e3
Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f
Treehugger Robot [Tue, 9 May 2017 10:33:50 +0000 (10:33 +0000)]
Merge "Refactor and improve logging."
Paul Duffin [Tue, 9 May 2017 10:29:59 +0000 (10:29 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am:
b2ac85e76d
Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa
Paul Duffin [Tue, 9 May 2017 10:23:15 +0000 (10:23 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
Andrew Scull [Tue, 9 May 2017 09:48:46 +0000 (09:48 +0000)]
Merge "Move LockSettingsService into locksettings package."
Erik Kline [Mon, 8 May 2017 08:56:35 +0000 (17:56 +0900)]
Refactor and improve logging.
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passed
- "dumpsys connectivity" shows new log output
Bug:
32163131
Bug:
36504926
Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0
Artem Iglikov [Tue, 9 May 2017 08:28:20 +0000 (08:28 +0000)]
Merge "Add some tests for TarBackupReader"
Pierre Lecesne [Tue, 9 May 2017 08:20:32 +0000 (08:20 +0000)]
Merge "Return exit code 1 when an error occurs during 'aapt2 dump'."
Pierre Lecesne [Fri, 5 May 2017 13:58:21 +0000 (14:58 +0100)]
Return exit code 1 when an error occurs during 'aapt2 dump'.
Bug:
37975355
Test: Manual
Change-Id: Ia29483a4aa10c98e75fe38ac0082759c8574a649
Charles He [Tue, 9 May 2017 08:11:53 +0000 (08:11 +0000)]
Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev am:
d2915725d9
am:
567564a1b0
Change-Id: Ia1abaee42c84496c6318094216b63958087d15ff
Charles He [Tue, 9 May 2017 08:04:18 +0000 (08:04 +0000)]
Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev
am:
d2915725d9
Change-Id: I817dbc31f61ef0dced2103b386124029562f0a48
Charles He [Tue, 9 May 2017 07:58:20 +0000 (07:58 +0000)]
Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev
Android Build Merger (Role) [Tue, 9 May 2017 06:49:20 +0000 (06:49 +0000)]
Merge "Merge "Move some NetworkStats tests to tests/net." into oc-dev am:
74fe2cbc3a -s ours am:
ea28d269ea -s ours"
Lorenzo Colitti [Tue, 9 May 2017 06:46:48 +0000 (06:46 +0000)]
Merge "Move some NetworkStats tests to tests/net." into oc-dev am:
74fe2cbc3a -s ours
am:
ea28d269ea -s ours
Change-Id: I40b5bb1e640358e6889f92dacdd2a977bc9758fb
Lorenzo Colitti [Tue, 9 May 2017 06:40:41 +0000 (06:40 +0000)]
Merge "Move some NetworkStats tests to tests/net." into oc-dev
am:
74fe2cbc3a -s ours
Change-Id: I4c58d302385c733108614c681632d3a8bc2dbdcf
Hugo Benichi [Tue, 9 May 2017 06:39:13 +0000 (06:39 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am:
767ac317e2 am:
717238a614 am:
44e9b81c54
am:
515a54c4b8
Change-Id: Ia0f85518fd0e75e768fa037c5d0bcf062b3c1f93
TreeHugger Robot [Tue, 9 May 2017 06:36:35 +0000 (06:36 +0000)]
Merge "Move some NetworkStats tests to tests/net." into oc-dev
Hugo Benichi [Tue, 9 May 2017 06:30:48 +0000 (06:30 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am:
767ac317e2 am:
717238a614
am:
44e9b81c54
Change-Id: I9c38d1254f82b50f4d1e953e72bf15a46562d3b8
Hugo Benichi [Tue, 9 May 2017 06:23:46 +0000 (06:23 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am:
767ac317e2
am:
717238a614
Change-Id: Id7ca8a16da5774a00517cfb60b877d181a358353
Hugo Benichi [Tue, 9 May 2017 06:14:47 +0000 (06:14 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
am:
767ac317e2
Change-Id: Ibf618a27b2e5cfb3e8a69528dfecd275b33f0336
Hugo Benichi [Tue, 9 May 2017 06:08:18 +0000 (06:08 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
* changes:
NsdService: simple cleanups
NsdService: test coverage for client requests.
NsdManager: remove duplicated argument validation
Android Build Merger (Role) [Tue, 9 May 2017 05:11:22 +0000 (05:11 +0000)]
Merge "Merge "Handling the touch better when the screen turns off" into oc-dev am:
bd54d2c2bd am:
9bf8edfc49 -s ours"
TreeHugger Robot [Tue, 9 May 2017 05:09:22 +0000 (05:09 +0000)]
Merge "update trust state immediately when user auths via FP on keyguard"
Selim Cinek [Tue, 9 May 2017 05:07:01 +0000 (05:07 +0000)]
Merge "Handling the touch better when the screen turns off" into oc-dev am:
bd54d2c2bd
am:
9bf8edfc49 -s ours
Change-Id: Ic52dca65fb9e809d22ff8e7bccb45f3a05295445
Selim Cinek [Tue, 9 May 2017 04:59:41 +0000 (04:59 +0000)]
Merge "Handling the touch better when the screen turns off" into oc-dev
am:
bd54d2c2bd
Change-Id: Id015cd13042de40521b2d5b951ce39cab53d5e49
TreeHugger Robot [Tue, 9 May 2017 04:54:20 +0000 (04:54 +0000)]
Merge "Handling the touch better when the screen turns off" into oc-dev
Winson Chung [Tue, 9 May 2017 04:18:48 +0000 (04:18 +0000)]
Merge "Fixing issue with wrong initial multi-window mode." into oc-dev am:
82792153c3
am:
5c6486b344
Change-Id: I1ee658c0ca43c345bfb24c9544af4b949f2e0f6e
Seigo Nonaka [Tue, 2 May 2017 05:17:36 +0000 (22:17 -0700)]
Fix double bolding
resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.
This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.
To be clear, this CL changes the function names but keeps the same
semantics as before.
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug:
37880319
Merged-In: Ied73189b11792fb062da46f45afd2db664e6ecb4
Change-Id: I82350a1bfb99ce198b955f127949e21bccccb1cb
Seigo Nonaka [Tue, 9 May 2017 04:05:22 +0000 (04:05 +0000)]
Fix double bolding
am:
264d3bef34
Change-Id: Id22cd02c81dd157c5264199745491858e89dbeb5
Winson Chung [Tue, 9 May 2017 04:05:03 +0000 (04:05 +0000)]
Merge "Fixing issue with wrong initial multi-window mode." into oc-dev
am:
82792153c3
Change-Id: I2a5ca7a9c5ee04ff007fab9c67ee8b9e766f36a1
Seigo Nonaka [Tue, 2 May 2017 05:17:36 +0000 (22:17 -0700)]
Fix double bolding
resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.
This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.
To be clear, this CL changes the function names but keeps the same
semantics as before.
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug:
37880319
Change-Id: Ied73189b11792fb062da46f45afd2db664e6ecb4
(cherry picked from commit
1f9c461e6a9537f91a6509e73eeb04ee6d5706cf)
Winson Chung [Tue, 9 May 2017 03:58:02 +0000 (03:58 +0000)]
Merge "Fixing issue with wrong initial multi-window mode." into oc-dev
TreeHugger Robot [Tue, 9 May 2017 03:41:10 +0000 (03:41 +0000)]
Merge "Add API for querying if a given keyphrase/locale is supported for AOHD."
Wale Ogunwale [Tue, 9 May 2017 03:05:20 +0000 (03:05 +0000)]
Merge "Merge "Fixed issue with associating WindowToken with null binder." into oc-dev am:
d193972a7f" into oc-dev-plus-aosp
am:
f14f5fa42f
Change-Id: I1934f8baa7f4e0c43a5d69c0a4d1b74a28407f5a
Philip P. Moltmann [Tue, 9 May 2017 02:59:45 +0000 (02:59 +0000)]
Merge "Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am:
9f028643c2" into oc-dev-plus-aosp
am:
d4f7a808a2
Change-Id: Ic2fdc1b93dc817ab7f046f2dbeff3755f02e9a9f
Philip P. Moltmann [Tue, 9 May 2017 02:55:27 +0000 (02:55 +0000)]
Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am:
9f028643c2
am:
b1e1d2bf0a
Change-Id: I9b96fdd581401389b2d1e494e3fab49683787518
Selim Cinek [Tue, 9 May 2017 02:53:28 +0000 (02:53 +0000)]
Merge "Handling the touch better when the screen turns off"
Android Build Merger (Role) [Tue, 9 May 2017 02:50:20 +0000 (02:50 +0000)]
Merge "Merge "Fixed issue with associating WindowToken with null binder." into oc-dev am:
d193972a7f" into oc-dev-plus-aosp
Wale Ogunwale [Tue, 9 May 2017 02:48:59 +0000 (02:48 +0000)]
Merge "Fixed issue with associating WindowToken with null binder." into oc-dev
am:
d193972a7f
Change-Id: I70b18aebd8ba5eb0cb8bac5c8bfdb4ca460885e1
Android Build Merger (Role) [Tue, 9 May 2017 02:48:29 +0000 (02:48 +0000)]
Merge "Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am:
9f028643c2" into oc-dev-plus-aosp
Philip P. Moltmann [Tue, 9 May 2017 02:46:49 +0000 (02:46 +0000)]
Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev
am:
9f028643c2
Change-Id: I658b6a686b29857efed216d13ad9c69295e332e0
TreeHugger Robot [Tue, 9 May 2017 02:39:55 +0000 (02:39 +0000)]
Merge "Fixed issue with associating WindowToken with null binder." into oc-dev
Philip P. Moltmann [Tue, 9 May 2017 02:36:48 +0000 (02:36 +0000)]
Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev
am:
9f028643c2
Change-Id: Iad96fb894325114f6adac5dde82751283f790025
Christopher Tate [Tue, 9 May 2017 02:32:43 +0000 (02:32 +0000)]
Merge "Don't bring up backup agents in secondary app processes" into oc-dev am:
67db70adf1
am:
5da9f2a62b
Change-Id: Iae2ce493f53a36f2da4a44b6cdf34b20ac43105c
Christopher Tate [Tue, 9 May 2017 02:20:27 +0000 (02:20 +0000)]
Merge "Don't bring up backup agents in secondary app processes" into oc-dev
am:
67db70adf1
Change-Id: I4a82af26fa61f25f254ae6f4441160ac6cc4a873
Philip P. Moltmann [Tue, 9 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev am:
f512575c68
am:
169989822e
Change-Id: I330cd6e1601584e3903a26b27047aae2e7b7c711
TreeHugger Robot [Tue, 9 May 2017 02:15:36 +0000 (02:15 +0000)]
Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev
Philip P. Moltmann [Tue, 9 May 2017 02:05:24 +0000 (02:05 +0000)]
Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
am:
f512575c68
Change-Id: I590a658c92ad271c7b4f18f5768c1a4e581ffe94
TreeHugger Robot [Tue, 9 May 2017 01:58:44 +0000 (01:58 +0000)]
Merge "Don't bring up backup agents in secondary app processes" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 01:49:52 +0000 (01:49 +0000)]
Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
* changes:
No need to deal with windowTokens
Persistable accessibility ID from ContextWrappers
Check callbacks when operting on UI
Hugo Benichi [Tue, 11 Apr 2017 05:42:47 +0000 (14:42 +0900)]
NsdService: simple cleanups
This patch replace some SparseArray<Integer> with SparseIntArray, and
simplify a value lookup function by using indexOfValue().
Test: TODO
Bug:
37013369,
33298084
Change-Id: I4872f8baa2bb2ff456c7f848d3afe2e7bcc9892e
Hugo Benichi [Fri, 28 Apr 2017 06:31:10 +0000 (15:31 +0900)]
NsdService: test coverage for client requests.
Adding coverage for:
- NsdManager client disconnection
- in-flight request GC
Test: new test passes
Bug:
37013369,
33298084
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug:
37013369
Change-Id: Iaad13e13976e9bf8f508d7188f823f8184ac414b
Jason Monk [Tue, 9 May 2017 01:49:20 +0000 (01:49 +0000)]
Merge "Fix bugs in cast QS tile" into oc-dev am:
03e920f3e9
am:
1c88a61673
Change-Id: Ifca93313598b3f6c8d126691dca51f3c1a29d17e
Android Build Merger (Role) [Tue, 9 May 2017 01:46:22 +0000 (01:46 +0000)]
Merge "Merge "Update AccountManager visibility JavaDoc." into oc-dev am:
47bf1b334a am:
65c57bc259"
TreeHugger Robot [Tue, 9 May 2017 01:45:37 +0000 (01:45 +0000)]
Merge "SpellCheckerSession: Fix brittle finalizer pattern."