OSDN Git Service
Tenghui Zhu [Tue, 9 May 2017 18:35:20 +0000 (18:35 +0000)]
Merge "Fix VectorDrawable size rounding issue" into oc-dev
am:
be030126fe
Change-Id: I6a9c6e4b6ea7c224406b703bada47f42d0fb0bf7
Mady Mellor [Tue, 9 May 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev
am:
5ddf88dfe6
Change-Id: I7881f729644e80d8fd881e780390e7102b732eba
Jorim Jaggi [Tue, 9 May 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Fix IME Keyguard exit animation" into oc-dev
am:
b4566b30fc
Change-Id: Ia857135f520ca1633f1ca4d53379ca7135c217b4
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
Tenghui Zhu [Tue, 9 May 2017 16:38:30 +0000 (16:38 +0000)]
Merge "Fix VectorDrawable size rounding issue" into oc-dev
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
TreeHugger Robot [Tue, 9 May 2017 16:29:45 +0000 (16:29 +0000)]
Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 16:24:08 +0000 (16:24 +0000)]
Merge "Fix IME Keyguard exit animation" into oc-dev
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
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
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:13:48 +0000 (15:13 +0000)]
Merge "Fix double bolding" into oc-dev
Jorim Jaggi [Mon, 8 May 2017 21:42:02 +0000 (23:42 +0200)]
Fix IME Keyguard exit animation
Keyguard exit animation was always applied no matter whether the
current window is shown or not. Because Keyguard exit starts with
alpha=0, this lead to a flicker with the IME window as a frame
later IME was applied its dismissal animation, which reverts it to
alpha=1 at the beginning.
Fix this by only applying exit animation if window is currently
hidden only by policy. Requires readding the old visibility method
*cough cough cough*
Ideally we would apply non-app window policy visibility/animation
at the same place...but today is not the day! (to minimize risk)
Test: Set password, unlock phone
Test: Don't set password, unlock to activity with IME up
Change-Id: I46110c80da4438223282903fd4defeba2c3f0550
Fixes:
36200726
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
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
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
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)"
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
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
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
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
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
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
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
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: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
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:39:49 +0000 (01:39 +0000)]
Merge "Fix bugs in cast QS tile" into oc-dev
am:
03e920f3e9
Change-Id: Ia953f48fe08bd8058cbc9e9bce1ab7466d03aa29
TreeHugger Robot [Tue, 9 May 2017 01:28:29 +0000 (01:28 +0000)]
Merge "Fix bugs in cast QS tile" into oc-dev
Dmitry Dementyev [Tue, 9 May 2017 01:26:52 +0000 (01:26 +0000)]
Merge "Update AccountManager visibility JavaDoc." into oc-dev
am:
47bf1b334a
Change-Id: If9ec5b44aaf90edc06ac8ed187c4f269d4198950
TreeHugger Robot [Tue, 9 May 2017 01:17:25 +0000 (01:17 +0000)]
Merge "Update AccountManager visibility JavaDoc." into oc-dev
Yi Kong [Tue, 9 May 2017 00:40:22 +0000 (00:40 +0000)]
Merge "Remove unused lambda captures" am:
1101f45613 am:
c7ce115073
am:
ca9988f0f9
Change-Id: Id1259cbbf1bbe9032d66315a346fa4d5d27ce2b3
Yi Kong [Tue, 9 May 2017 00:34:20 +0000 (00:34 +0000)]
Merge "Remove unused lambda captures" am:
1101f45613
am:
c7ce115073
Change-Id: I284275ea9abc1eb1d6655372ddd27f9cb2eef4ab
Yi Kong [Tue, 9 May 2017 00:28:46 +0000 (00:28 +0000)]
Merge "Remove unused lambda captures"
am:
1101f45613
Change-Id: I371bd344d87a213393787a528121308c96c12d83
Yi Kong [Tue, 9 May 2017 00:19:08 +0000 (00:19 +0000)]
Merge "Remove unused lambda captures"
Android Build Merger (Role) [Tue, 9 May 2017 00:17:27 +0000 (00:17 +0000)]
Merge "Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev am:
7a5024e048" into oc-dev-plus-aosp
Dongwon Kang [Tue, 9 May 2017 00:15:18 +0000 (00:15 +0000)]
Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev
am:
7a5024e048
Change-Id: I3878c92c3695e4abee4bb486c80c0c6e6fd8151a
Dongwon Kang [Tue, 9 May 2017 00:08:25 +0000 (00:08 +0000)]
Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev
am:
7a5024e048
Change-Id: I00dfa3af1b542d6e388b2f226526abb674f82a3e
Dongwon Kang [Mon, 8 May 2017 23:56:04 +0000 (23:56 +0000)]
Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev
Wale Ogunwale [Mon, 8 May 2017 23:46:23 +0000 (23:46 +0000)]
Merge "Revert "Only allow AM to update display orientation based on app containers"" into oc-dev
am:
91f241b35c
Change-Id: I7b9c3737840bce70ca2532fc0b445141407b8d90
TreeHugger Robot [Mon, 8 May 2017 23:35:10 +0000 (23:35 +0000)]
Merge "Revert "Only allow AM to update display orientation based on app containers"" into oc-dev
Philip P. Moltmann [Mon, 8 May 2017 23:17:08 +0000 (23:17 +0000)]
Merge "Read the autofill highlight from rootView context" into oc-dev
am:
f51b5f991c
Change-Id: Ibaef62c34d3c966d104244ba3380864451c8cb6c
Fan Zhang [Mon, 8 May 2017 23:09:44 +0000 (23:09 +0000)]
Merge "Adjust icon width to match the width with framework" into oc-dev
am:
7acd87d8d0
Change-Id: I17195379a917347d10a2aa11e1788ea920cde61d
Todd Kennedy [Mon, 8 May 2017 23:09:42 +0000 (16:09 -0700)]
Always throw a ConnectionException on error
There was a single case where we would return a 'null' for the service
connect; if bindServiceAsUser() returned 'false'. Handle this condition
with an exception. Also make the exception descriptive enough so we
can add the correct resolution status to the resolution logs.
Change-Id: I6cee25adfa74745579577cb9726f8dd9c2950746
Fixes:
38131147
Test: Manual; restart the resolver and see the exceptions
Philip P. Moltmann [Mon, 8 May 2017 23:06:24 +0000 (23:06 +0000)]
Merge "Read the autofill highlight from rootView context" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 22:58:55 +0000 (22:58 +0000)]
Merge "Adjust icon width to match the width with framework" into oc-dev
Selim Cinek [Wed, 3 May 2017 03:02:30 +0000 (20:02 -0700)]
Handling the touch better when the screen turns off
Previously we were only cancelling touches when
showing keyguard, but this is not enough, since
a user might be touching it while on the keyguard
(e.g with falsing)
Fixes:
37287962
Fixes:
36416066
Fixes:
37696557
Test: manual, turn of screen while interacting
Merged-In: I572ade2380986ef087468dff721b1d1dfa7a48ab
Change-Id: I572ade2380986ef087468dff721b1d1dfa7a48ab
Chien-Yu Chen [Mon, 8 May 2017 22:33:56 +0000 (22:33 +0000)]
Merge changes from topic 'enableZslApi' into oc-dev
am:
9414a25592
Change-Id: I9d4fb74e37782f269966dda855f716e24ed42000
Jaewan Kim [Mon, 8 May 2017 22:31:09 +0000 (22:31 +0000)]
Merge "TV PIP: Fix broken TV PIP" into oc-dev
am:
2e0d455177
Change-Id: If3a85b43b3d1dc27aefe58253888b96d2710f673
TreeHugger Robot [Mon, 8 May 2017 22:28:29 +0000 (22:28 +0000)]
Merge changes from topic 'enableZslApi' into oc-dev
* changes:
camera: Clarify TEMPLATE_ZERO_SHUTTER_LAG
camera: Clarify ZSL supports
TreeHugger Robot [Mon, 8 May 2017 22:26:13 +0000 (22:26 +0000)]
Merge "TV PIP: Fix broken TV PIP" into oc-dev
Jorim Jaggi [Mon, 8 May 2017 22:08:57 +0000 (22:08 +0000)]
Merge "Exit transient mode as soon as status bar window is fullscreen" into oc-dev
am:
f93dc8b650
Change-Id: Ib0981ecbcaa461f7f5eef8133fd26155c6db304d
Connor O'Brien [Mon, 8 May 2017 22:06:18 +0000 (22:06 +0000)]
Merge "PowerManagerService: open power HAL less aggressively" into oc-dev
am:
ebf8ae5f44
Change-Id: I75f77f6eab33bf7d445ecf7cf896b21eb4a3c27d
Dongwon Kang [Mon, 8 May 2017 21:59:35 +0000 (21:59 +0000)]
Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev
am:
05e63bf5fa
Change-Id: If989da1a118d28c85d127c541a6bdbe4b35d9ac2
Andrew Solovay [Mon, 8 May 2017 21:52:47 +0000 (21:52 +0000)]
Merge "docs: Changing "http" to "https" in Javadoc examples" into oc-dev
am:
c159323ebd
Change-Id: Idc4d792cab87f53f007873d4b5a53834411e1412
TreeHugger Robot [Mon, 8 May 2017 21:48:25 +0000 (21:48 +0000)]
Merge "Exit transient mode as soon as status bar window is fullscreen" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 21:46:24 +0000 (21:46 +0000)]
Merge "PowerManagerService: open power HAL less aggressively" into oc-dev
Julius D'souza [Mon, 8 May 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am:
5b8250964b am:
cc1435b7f3 -s ours" into oc-dev
am:
989657bdb0
Change-Id: I8326b24d3f6af4993dabd1f3e2bd104b8f7ed36c
Selim Cinek [Mon, 8 May 2017 21:37:31 +0000 (21:37 +0000)]
Merge changes from topic 'background_inflation' into oc-dev
am:
03fbdbe6ff
Change-Id: I1848e1f5a1ec5f9785872690b4d653afd590399f
Dongwon Kang [Mon, 8 May 2017 21:36:56 +0000 (21:36 +0000)]
Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev
Wale Ogunwale [Mon, 8 May 2017 21:22:42 +0000 (14:22 -0700)]
Revert "Only allow AM to update display orientation based on app containers"
This reverts commit
5f1ae6aaca78a14d25e28042df32df642ab3d29e.
This caused b/
38021942.
Change-Id: Idb23e5ede7aaa4a927e148c0daab3f56ac449d66
Fixes:
38021942
Bug:
37550022
Test: manual
Svet Ganov [Mon, 8 May 2017 21:35:04 +0000 (21:35 +0000)]
Merge "Also check if view visible to user before engaging fill" into oc-dev
am:
f0de5cdd9a
Change-Id: I4bc8da5708af987721647eb50a4968db5034cd94
Andrew Solovay [Mon, 8 May 2017 21:29:18 +0000 (21:29 +0000)]
Merge "docs: Changing "http" to "https" in Javadoc examples" into oc-dev
Android Build Merger (Role) [Mon, 8 May 2017 21:26:27 +0000 (21:26 +0000)]
Merge "Merge "Fixed placemente of Autofill UI for virtual views." into oc-dev am:
370b040cf9" into oc-dev-plus-aosp
Felipe Leme [Mon, 8 May 2017 21:24:48 +0000 (21:24 +0000)]
Merge "Fixed placemente of Autofill UI for virtual views." into oc-dev
am:
370b040cf9
Change-Id: I3741b0ef8893eb660230698432c7d316995642b8
Android Build Merger (Role) [Mon, 8 May 2017 21:22:44 +0000 (21:22 +0000)]
Merge "Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am:
5b8250964b am:
cc1435b7f3 -s ours" into oc-dev am:
817aa8fd23" into oc-dev-plus-aosp
OSDN Git Service
