OSDN Git Service
Bill Yi [Mon, 30 Oct 2017 07:01:17 +0000 (07:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
68b49a3a8e -s ours
Change-Id: I1249381abcb2c1610a8671af6993121c24280234
Bill Yi [Mon, 30 Oct 2017 06:53:47 +0000 (06:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
d4ebf7c597 -s ours
Change-Id: I481f1ba311d3d020d789c33b8601886babe96b55
Bill Yi [Mon, 30 Oct 2017 06:48:58 +0000 (06:48 +0000)]
Import translations. DO NOT MERGE
am:
0159791633 -s ours
Change-Id: I7f9b5f26161dd3991584e46e5d899884ec7e245d
TreeHugger Robot [Mon, 30 Oct 2017 06:43:27 +0000 (06:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Mon, 30 Oct 2017 03:26:54 +0000 (03:26 +0000)]
Merge "Define OWNERS for permission grant changes." am:
8d2a5bd42a
am:
4ab5a3f8cd
Change-Id: Ie27d6ee76a7ab6585881d5f83c197ab99f7d26f4
Jeff Sharkey [Mon, 30 Oct 2017 03:11:43 +0000 (03:11 +0000)]
Merge "Define OWNERS for permission grant changes."
am:
8d2a5bd42a
Change-Id: Ib91c1ecc3d673ba103f966008609d2444107eb7e
Treehugger Robot [Mon, 30 Oct 2017 03:00:55 +0000 (03:00 +0000)]
Merge "Define OWNERS for permission grant changes."
Jeff Sharkey [Fri, 27 Oct 2017 18:13:37 +0000 (12:13 -0600)]
Define OWNERS for permission grant changes.
Permission grant changes need explicit approval from product and
SWE leadership to ensure that CTS/CDD requirements are met.
Change-Id: I0a84712b5c5b4e11e72bf5921b72ef6a47e7fdc1
Mengjun Leng [Sun, 29 Oct 2017 18:11:58 +0000 (18:11 +0000)]
Merge "Add support for send Message with messaging options" am:
1400db6748
am:
340b410675
Change-Id: I5f35e53048993fee9af7731734aa5f87380c8148
Mengjun Leng [Sun, 29 Oct 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add support for send Message with messaging options"
am:
1400db6748
Change-Id: I29ffbb64c35214761b7f6921212920cf8ffc8599
Treehugger Robot [Sun, 29 Oct 2017 17:48:44 +0000 (17:48 +0000)]
Merge "Add support for send Message with messaging options"
Bill Yi [Sun, 29 Oct 2017 15:05:49 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If774e276d4d0e78233d6b22edbf33900ef866390
Bill Yi [Sun, 29 Oct 2017 14:33:12 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic418f5712f192bb12d935713042b22b124817725
Bill Yi [Sun, 29 Oct 2017 14:25:41 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I837b9a3c84d21544715855d80fc04af6fddf7b95
Felipe Leme [Sat, 28 Oct 2017 03:02:58 +0000 (03:02 +0000)]
Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev
am:
e72d655f1d
Change-Id: Ib3e6de8f42833f22bc50c949a0a346853485b130
TreeHugger Robot [Sat, 28 Oct 2017 02:45:48 +0000 (02:45 +0000)]
Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev
Andrew Solovay [Sat, 28 Oct 2017 02:01:06 +0000 (02:01 +0000)]
Merge "docs: Typo fixes" into oc-mr1-dev
am:
ab9449561e
Change-Id: I6edaeba7a59fab7fafe7847a6b27dbba8313d233
Andrew Solovay [Sat, 28 Oct 2017 01:49:32 +0000 (01:49 +0000)]
Merge "docs: Typo fixes" into oc-mr1-dev
Guang Zhu [Sat, 28 Oct 2017 00:52:18 +0000 (00:52 +0000)]
limit the verbosity of app crash failure message
am:
3bd7187267
Change-Id: I193f8b7964c4757f5ac873758ad433fe94d3885a
Felipe Leme [Thu, 26 Oct 2017 16:23:43 +0000 (09:23 -0700)]
Minor fixes on SaveInfo javadoc.
Test: ran 'mmm -j108 frameworks/base/:doc-comment-check-docs' and checked HTML
Bug:
68402851
Merged-in: I9ba776be77132942d516d23ac69d3ad9f9b3da62
Change-Id: I9ba776be77132942d516d23ac69d3ad9f9b3da62
Hall Liu [Fri, 27 Oct 2017 23:49:37 +0000 (23:49 +0000)]
Merge "EMBMS - Add TestApi and provide service override" am:
1fab41e771
am:
dfc37f77c9
Change-Id: I3ecc9c267fa7f107a11bc9e1a4fbdb6c2772ec20
Hall Liu [Fri, 27 Oct 2017 23:32:58 +0000 (23:32 +0000)]
Merge "EMBMS - Add TestApi and provide service override"
am:
1fab41e771
Change-Id: I5c44393e98c432b3c7a28c7b5b1906aa80f62372
Hall Liu [Fri, 27 Oct 2017 23:19:29 +0000 (23:19 +0000)]
Merge "EMBMS - Add TestApi and provide service override"
Andrew Solovay [Fri, 27 Oct 2017 22:11:48 +0000 (15:11 -0700)]
docs: Typo fixes
See first comment for doc stage location.
Change-Id: I29661ffab0ff10021671df0b725c9f9b12430960
Bug:
67886596
Bug:
67932414
Test: make ds-docs
Tyler Gunn [Fri, 27 Oct 2017 21:53:12 +0000 (21:53 +0000)]
Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager." am:
6d0f1eff8b
am:
dbd2972e6c -s ours
Change-Id: I0af5402a8854d87b20fc920a7432322222c4ade1
Hansong Zhang [Fri, 27 Oct 2017 21:38:51 +0000 (21:38 +0000)]
Merge "Enable HID Device Profile Service (2/2)" am:
7e3fbd59d1
am:
21bb474cc3
Change-Id: I84377e882c77b16862b1e049c54e36dc94c78883
Tyler Gunn [Fri, 27 Oct 2017 21:37:34 +0000 (21:37 +0000)]
Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager."
am:
6d0f1eff8b
Change-Id: I55e7f4684f8160f70548e662cd030fce565b16a9
Hansong Zhang [Fri, 27 Oct 2017 21:27:03 +0000 (21:27 +0000)]
Merge "Enable HID Device Profile Service (2/2)"
am:
7e3fbd59d1
Change-Id: I993b08e37f0ebcc7bca0b2b536348c41dd548861
Tyler Gunn [Fri, 27 Oct 2017 21:25:06 +0000 (21:25 +0000)]
Merge "Handle alternate status values." am:
b728e56959
am:
0f6a2f350d -s ours
Change-Id: If6fef3f4e0c2e178d8715e0bb739404691e18fc8
Tyler Gunn [Fri, 27 Oct 2017 21:13:30 +0000 (21:13 +0000)]
Merge "Handle alternate status values."
am:
b728e56959
Change-Id: I1c82dd103b03eecba025a7638e06906699429c74
Treehugger Robot [Fri, 27 Oct 2017 21:12:24 +0000 (21:12 +0000)]
Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager."
Treehugger Robot [Fri, 27 Oct 2017 21:06:44 +0000 (21:06 +0000)]
Merge "Enable HID Device Profile Service (2/2)"
Treehugger Robot [Fri, 27 Oct 2017 20:55:53 +0000 (20:55 +0000)]
Merge "Handle alternate status values."
Tyler Gunn [Fri, 1 Sep 2017 22:17:05 +0000 (15:17 -0700)]
Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager.
When TelecomManager methods perform a read phonestate check from a work
profile user, it is possible to get an INTERACT_ACROSS_USERS exception.
This is due to the fact that the filterByIntent method was not calling
queryIntentActivitiesAsUser.
Test: Manual
Bug:
31304557
Merged-In: I6bc7419ba260050281d83e33f7f328ec5ccb3cd8
Change-Id: I2a1869162e5a52aed986a99cc378a6c630af4a70
Tyler Gunn [Fri, 25 Aug 2017 22:01:00 +0000 (15:01 -0700)]
Handle alternate status values.
Some carriers use sendrecv to indicate a call in a conference is active,
and sendonly to indicate that the remote party has held the call.
Adding support for these status values.
This ensures that remotely held calls for these carriers are set to held.
Test: Manual
Bug:
33272103
Merged-In: Ie386bdb4c77df1305d80f604f48174794c3ee0c1
Change-Id: I4a950c4e143d5ac396b30569dbda0b1cf4e92a3e
Tyler Gunn [Fri, 27 Oct 2017 19:35:54 +0000 (19:35 +0000)]
Merge "Ensure CallId is not null when connection creation is complete." am:
47b23176bd
am:
5458f38518 -s ours
Change-Id: I9152a42c8e0bbb766a22f69480748a6534e993bc
Tyler Gunn [Fri, 27 Oct 2017 19:26:07 +0000 (19:26 +0000)]
Merge "Ensure CallId is not null when connection creation is complete."
am:
47b23176bd
Change-Id: Ifddd99f22edfa787a3447cbaa66dd4e70a430ba3
Treehugger Robot [Fri, 27 Oct 2017 19:09:47 +0000 (19:09 +0000)]
Merge "Ensure CallId is not null when connection creation is complete."
Tetsutoki Shiozawa [Fri, 27 Oct 2017 19:03:32 +0000 (19:03 +0000)]
Merge "Fix: AccountManagerService crashed by accessing closed db" am:
6ac8f42d9e
am:
741736cafa
Change-Id: Ic7ae1006f1650653d75685b5a6d5b22e74b8f950
Guang Zhu [Thu, 26 Oct 2017 00:04:25 +0000 (17:04 -0700)]
limit the verbosity of app crash failure message
- reporting full dropbox content for all detected crashes leads
to overly verbose test failure message
Bug:
67002148
Test: http://sponge/
4ff3ccb5-c455-45e2-9614-
d3527e1f711d
Change-Id: Ic2cd2ba4ce2af0954f186b196c18cc76c19f2007
Tetsutoki Shiozawa [Fri, 27 Oct 2017 18:53:20 +0000 (18:53 +0000)]
Merge "Fix: AccountManagerService crashed by accessing closed db"
am:
6ac8f42d9e
Change-Id: I35f289e43a7406087a13258b5e6cbf5e179dc529
Treehugger Robot [Fri, 27 Oct 2017 18:41:59 +0000 (18:41 +0000)]
Merge "Fix: AccountManagerService crashed by accessing closed db"
Manoj Boopathi Raj [Fri, 27 Oct 2017 18:06:09 +0000 (18:06 +0000)]
Merge "Fixed NullPointerException in IpSecService-Netd binder layer" am:
bf74a93eb2
am:
a096e8d177
Change-Id: I23ea94140ac3e34fc92fdc6a2c0d694396489e03
Tyler Gunn [Sat, 17 Jun 2017 03:20:34 +0000 (20:20 -0700)]
Ensure CallId is not null when connection creation is complete.
When calling "get" on the mConnectoinById map, a null callId will result
in an NPE.
In findConnectionForAction, defaulting to returning the "null" connection
which is the same behavior as if it isn't found.
In notifyCreateConnectionComplete, specifically checking if the callId
is null and skipping the onCreateConnectionComplete callback.
This scenario is possible if the connection is remove from the
ConnectionService before the connection complete callback comes back from
Telecom.
Test: Manual
Fixes:
62588734
Merged-In: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3
Change-Id: Ie610c51155ed417e0f916000fe20e4484bdb6603
Cassie Han [Fri, 27 Oct 2017 17:54:36 +0000 (17:54 +0000)]
Merge "Add the operator name and MCC/MNC in string format into the CellIdentity." am:
1565803cd2
am:
e64d907a49
Change-Id: I0f145a458bff20dd9e6484120331bcc59b2dd8d3
Manoj Boopathi Raj [Fri, 27 Oct 2017 17:47:08 +0000 (17:47 +0000)]
Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
am:
bf74a93eb2
Change-Id: Ia73c6bda7cb265f91648139e15f4bd2668e6c531
Hans Boehm [Fri, 27 Oct 2017 17:38:31 +0000 (17:38 +0000)]
Merge "Don't allocate GlobalRefs for BinderProxy" am:
1455a1d0c0
am:
b4210d8160
Change-Id: Ida801a358acab13e8515db98b37165179cf5135a
Cassie Han [Fri, 27 Oct 2017 17:36:52 +0000 (17:36 +0000)]
Merge "Add the operator name and MCC/MNC in string format into the CellIdentity."
am:
1565803cd2
Change-Id: Ie0a1305eb73256f358a853d87778f755d3b9e4d0
Manoj Boopathi Raj [Fri, 27 Oct 2017 17:32:56 +0000 (17:32 +0000)]
Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
Hans Boehm [Fri, 27 Oct 2017 17:28:39 +0000 (17:28 +0000)]
Merge "Don't allocate GlobalRefs for BinderProxy"
am:
1455a1d0c0
Change-Id: Id971af4742bb26790449c78f9520b9a7744df39a
Cassie Han [Fri, 27 Oct 2017 17:17:54 +0000 (17:17 +0000)]
Merge "Add the operator name and MCC/MNC in string format into the CellIdentity."
Hans Boehm [Fri, 27 Oct 2017 17:15:41 +0000 (17:15 +0000)]
Merge "Don't allocate GlobalRefs for BinderProxy"
Hansong Zhang [Wed, 27 Sep 2017 21:17:20 +0000 (14:17 -0700)]
Enable HID Device Profile Service (2/2)
Add Profile Proxy for HID Device Profile.
* Add a helper method doUnbind() to deal with unbinding to Bluetooth HID
Service.
* Fix docstrings.
Bug:
63384609
Test: SL4A Bluetooth HID test
Change-Id: I168c21c3b010baac9889c556635b914c0ba3f267
Daniel Sandler [Fri, 27 Oct 2017 14:57:59 +0000 (14:57 +0000)]
Merge "Give fg services a shelf life before they go bad." into oc-mr1-dev
am:
17efe6be85
Change-Id: Idc2dccabb41e26296b8cd6ffa31d42c811fff5fe
Daniel Sandler [Fri, 27 Oct 2017 14:39:01 +0000 (14:39 +0000)]
Merge "Give fg services a shelf life before they go bad." into oc-mr1-dev
Dan Sandler [Fri, 27 Oct 2017 03:27:57 +0000 (23:27 -0400)]
Give fg services a shelf life before they go bad.
When a fg service starts (as indicated by its presence in a
NOTE_FOREGROUND_SERVICES notification), we note the service
start time (as encoded in Notification.when in ActivityMgr).
SysUI will suppress the dungeon (foreground service
disclosure) notification until 5 seconds have elapsed since
the earliest service start time. After that, if the service
is still running, the disclosure will be shown.
Bug:
67819284
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I5b6df95eb673e2f551aaa3ecc5a7df617f815a90
Erik Kline [Fri, 27 Oct 2017 13:15:41 +0000 (13:15 +0000)]
Merge "Remove unused method on VersionedBroadcastListener" am:
536d241fb2
am:
0ce85f8c51
Change-Id: Id310aee1633c0167be297422db02d206877390eb
Erik Kline [Fri, 27 Oct 2017 13:04:47 +0000 (13:04 +0000)]
Merge "Remove unused method on VersionedBroadcastListener"
am:
536d241fb2
Change-Id: I63c8ad050330dd4e938388d03fa9cf270b108e56
Treehugger Robot [Fri, 27 Oct 2017 12:47:45 +0000 (12:47 +0000)]
Merge "Remove unused method on VersionedBroadcastListener"
Android Build Merger (Role) [Fri, 27 Oct 2017 10:38:17 +0000 (10:38 +0000)]
Merge changes from topic "am-
bd8937297d1b4d4295c6ad984c3fd2c7" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "tz_catchup1" am:
4e0a02ce1f am:
60bc26e3e2
Be more explicit about users am:
b755291e65 am:
8f57711f2f
Neil Fuller [Fri, 27 Oct 2017 10:32:48 +0000 (10:32 +0000)]
Merge changes from topic "tz_catchup1" am:
4e0a02ce1f
am:
60bc26e3e2
Change-Id: Id72c4cb572051e3898d2f432918feb0875b104c3
Bill Yi [Fri, 27 Oct 2017 10:31:07 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c0ac6fb4e3 -s ours
Change-Id: I588474eb1a4e5d96fa9a104603c7f172bdba6100
Neil Fuller [Fri, 27 Oct 2017 10:29:07 +0000 (10:29 +0000)]
Be more explicit about users am:
b755291e65
am:
8f57711f2f
Change-Id: Ic949dce3ed9b6102eb780981166a0f6b09b43d94
TreeHugger Robot [Fri, 27 Oct 2017 10:20:09 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Neil Fuller [Fri, 27 Oct 2017 10:13:15 +0000 (10:13 +0000)]
Merge changes from topic "tz_catchup1"
am:
4e0a02ce1f
Change-Id: I629930379afd2e3037bbd460ebc83726a8bb0008
Neil Fuller [Fri, 27 Oct 2017 10:08:35 +0000 (10:08 +0000)]
Be more explicit about users
am:
b755291e65
Change-Id: I0dd17273997adc207b5e389624b820e80ccaaa89
Neil Fuller [Fri, 27 Oct 2017 09:54:15 +0000 (09:54 +0000)]
Merge changes from topic "tz_catchup1"
* changes:
Add newly available version information to dumpsys
Be more explicit about users
Bill Yi [Fri, 27 Oct 2017 06:27:26 +0000 (23:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I752d240f2a039f727edac641136078ddee540e34
Erik Kline [Fri, 27 Oct 2017 05:16:56 +0000 (14:16 +0900)]
Remove unused method on VersionedBroadcastListener
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manually enabling USB tethering toward Wi-Fi worked
Bug:
32163131
Change-Id: I38e4b77a7d59584ebeb450ebe5a9dcbcb36f4fa1
Android Build Merger (Role) [Fri, 27 Oct 2017 04:02:09 +0000 (04:02 +0000)]
Merge "Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am:
37082aa53e -s ours" into oc-mr1-dev am:
074ecca5e0 -s ours" into oc-mr1-dev-plus-aosp
Hans Boehm [Fri, 27 Oct 2017 03:58:59 +0000 (03:58 +0000)]
Merge "Convert Binder & BinderProxy to NativeAllocationRegistry" am:
bd6d3c5743
am:
a177c5c9d2
Change-Id: I087b9b3374fc51fa5ded63fbd999f4398f564628
Christine Franks [Fri, 27 Oct 2017 03:58:49 +0000 (03:58 +0000)]
Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am:
37082aa53e -s ours" into oc-mr1-dev
am:
074ecca5e0 -s ours
Change-Id: I6ec817c51f26332cc0c903d932513aca93e3b823
Chad Brubaker [Fri, 27 Oct 2017 03:51:11 +0000 (03:51 +0000)]
Merge "Allow internal services access to instant apps" into oc-mr1-dev
am:
d70982ad7e
Change-Id: Ic799df1e5abbbe113ddc0d54f79140e952f8d314
Hans Boehm [Fri, 27 Oct 2017 03:47:51 +0000 (03:47 +0000)]
Merge "Convert Binder & BinderProxy to NativeAllocationRegistry"
am:
bd6d3c5743
Change-Id: Iae1e438cc9595efe1dd68c579d42ae129ac53e5e
Mengjun Leng [Mon, 13 Mar 2017 09:08:26 +0000 (17:08 +0800)]
Add support for send Message with messaging options
Add support for following messaging options.
1.Add support for message priority in 3gpp2.
2.Add link control support while sending multiple messages.
3.Add validity period support in 3gpp.
Change-Id: I19f4fbc5a3b6922884196b301d30280acd9e501e
MSIM(Telephony): Add changes to SMS APIs as per new SmsManager design
Change SMS Msim APIs as per new SmsManager design
Change-Id: I14ad7685e23b14203a76dfe3cc5a95a337f7d0e3
Jason Monk [Fri, 27 Oct 2017 03:30:28 +0000 (03:30 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev am:
885bf1302e -s ours
am:
74fc763fc8
Change-Id: Ib90ed41698e308d53a2619abe2fa6f028eeaf07a
Hans Boehm [Fri, 27 Oct 2017 03:27:29 +0000 (03:27 +0000)]
Merge "Convert Binder & BinderProxy to NativeAllocationRegistry"
Android Build Merger (Role) [Fri, 27 Oct 2017 03:25:38 +0000 (03:25 +0000)]
Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am:
37082aa53e -s ours" into oc-mr1-dev
Christine Franks [Fri, 27 Oct 2017 03:23:01 +0000 (03:23 +0000)]
Merge "Support native and srgb for night display" into oc-dr1-dev
am:
37082aa53e -s ours
Change-Id: I6a7d3864db78ac95a175cc9097a821daa6ea6658
Chad Brubaker [Fri, 27 Oct 2017 03:22:39 +0000 (03:22 +0000)]
Merge "Allow internal services access to instant apps" into oc-mr1-dev
Jason Monk [Fri, 27 Oct 2017 03:15:58 +0000 (03:15 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev
am:
885bf1302e -s ours
Change-Id: Ia35e09b9935da7bd63f08afd82dac950a9acd344
Tetsutoki Shiozawa [Tue, 24 Oct 2017 09:44:00 +0000 (18:44 +0900)]
Fix: AccountManagerService crashed by accessing closed db
Symptom:
When a current user was switched, AccountManagerService crashed with
IllegalStateException.
Root cause:
accountsDb was closed when user was stopped. AccountManagerService
tried to insert a log record to the closed db and it failed.
Solution:
It catches the exception if it's failed to insert a log record.
Bug:
68233592
Change-Id: I97b63e4777bf7f8a1d38d96e494f6a21847d374b
Android Build Merger (Role) [Fri, 27 Oct 2017 01:28:00 +0000 (01:28 +0000)]
Merge "Merge "ActivityManager: Change documentation of low RAM" into oc-mr1-dev am:
c1158f762a" into oc-mr1-dev-plus-aosp
Greg Kaiser [Fri, 27 Oct 2017 01:24:56 +0000 (01:24 +0000)]
Merge "ActivityManager: Change documentation of low RAM" into oc-mr1-dev
am:
c1158f762a
Change-Id: Ifd4c56b13f3bdbc0ef12a9fac335203fa471ac50
Yohei Yukawa [Fri, 27 Oct 2017 01:21:20 +0000 (01:21 +0000)]
Merge "IMMS should preserve enabled/selected IMEs upon boot" am:
171c82acb4
am:
9e5c77c194
Change-Id: I75ba9b67eb8c88931788c869d0ff5a25c950693e
Yohei Yukawa [Fri, 27 Oct 2017 01:10:36 +0000 (01:10 +0000)]
Merge "IMMS should preserve enabled/selected IMEs upon boot"
am:
171c82acb4
Change-Id: I13b12269eb1cd29bb28bd6a1dadac59a2d539380
TreeHugger Robot [Fri, 27 Oct 2017 01:07:19 +0000 (01:07 +0000)]
Merge "ActivityManager: Change documentation of low RAM" into oc-mr1-dev
Treehugger Robot [Fri, 27 Oct 2017 00:49:19 +0000 (00:49 +0000)]
Merge "IMMS should preserve enabled/selected IMEs upon boot"
Romain Guy [Fri, 27 Oct 2017 00:22:56 +0000 (00:22 +0000)]
Add color mode setting am:
af5e11245d -s ours
am:
9d8c5f626a -s ours
Change-Id: I3f2491bc5822f00a2cc80abfc203a1bc5da752c0
Romain Guy [Fri, 27 Oct 2017 00:07:58 +0000 (00:07 +0000)]
Add color mode setting
am:
af5e11245d -s ours
Change-Id: I57d6a2503f28fb8c26ac0e5e644306bbe812a347
TreeHugger Robot [Thu, 26 Oct 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Support native and srgb for night display" into oc-dr1-dev
Hall Liu [Fri, 20 Oct 2017 18:30:16 +0000 (11:30 -0700)]
EMBMS - Add TestApi and provide service override
Add @TestApi annotations to methods that CTS needs
Add a manifest meta-data key that allows client apps to specify the
exact component name of the MBMS service to bind to.
Bug:
68049452
Test: CTS
Change-Id: I50654c41da38696a25fad93d0a5e0b0c11fa0b42
TreeHugger Robot [Thu, 26 Oct 2017 22:17:40 +0000 (22:17 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev
* changes:
Auto-dim refinements
Refinement of auto-dimming nav
Don't touch auto dim on app change
Auto dim the nav bar to help prevent diff aging
Yohei Yukawa [Thu, 26 Oct 2017 22:00:59 +0000 (15:00 -0700)]
IMMS should preserve enabled/selected IMEs upon boot
This is a follow up CL to my refactoring CL [1], which unintentionally
changed the condition to reset default enabled IMEs when the device
boots up.
Previously, InputMethodManagerService (IMMS) resets default enabled
IMEs upon device boot only for the first boot scenario, by checking
whether Settings.Secure.DEFAULT_INPUT_METHOD is already set or not.
My refactoring CL accidentally replaced that check with unconditional
"true", which means now IMMS always resets default enabled IMEs every
time the device boots up. This behavior change is of course
unintentional but has no effect after the user unlocks the device
because IMMS also discard all the settings change made while
UserManager.isUserUnlocked() returns false [2]. Hence the above
behavior change is completely hidden on direct-boot disabled devices,
where the system behaves as if the user unlocked the device
immediately after the boot is completed. The behavior change is
observable only on direct-boot devices.
Anyway, IMMS should try to do its best to keep the last used IME and
user selected IMEs even in user locked state as long as those IMEs
are compatible with direct-boot. This CL revives the previous
behavior by adding the same condition check again.
[1]: I5b37c450db4b25b3e635b6d634293a34eec8b9d4
7924782c000733b2d7a180701b74988f0154adee
[2]: Ifa2225070bf8223f8964cf063c86889e312c5e9a
ed4952ad0f76a70549777472cd9cefcbc8705917
Fixes:
67093433
Fixes:
67491290
Test: Manually verified as follows
1. Check out AOSP master
2. Build an OS image for a direct-boot aware device then
flash it.
3. Open
development/samples/SoftKeyboard/AndroidManifest.xml
then add
android:directBootAware="true"
to the IME service.
4. Open
development/samples/SoftKeyboard/res/xml/method.xml
then add
android:isAsciiCapable="true"
to "en_US" IME subtype.
5. tapas SoftKeyboard
6. make -j
7. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
8. Open system settings:
System -> Languages & input -> Virtual keyboard
-> Manage keyboards
9. Enable Sample Soft keyboard
10. Disable Android Keyboard (AOSP)
11. Open system settings:
Security -> Screen lock -> Password
then set up a device password "aaaa".
12. Reboot the device.
13. Make sure that
* Sample Soft keyboard is shown in the unlock screen.
* AOSP Keyboard is not enabled in the unlock screen.
Change-Id: Id624d577d941245cca944498dc6935eb364865cf
Hans Boehm [Wed, 4 Oct 2017 01:01:20 +0000 (18:01 -0700)]
Don't allocate GlobalRefs for BinderProxy
This removes all GlobalRef allocation as part of building BinderProxys.
Previously these were used to map IBinders to the corresponding
Java object, so the Java objects could be reused. We now keep
that mapping at the Java level.
This means we often need to call into Java to look up or allocate
a BinderProxy. But this replaces a prior call to Java to dereference
a WeakReference. The Java custom Java map-to-WeakReference data
structure is probably not terribly efficient, but the original
attachement mechanism did not seem to be either. And this
avoids potentially even more catastrophic issues when the number
of GlobalRefs approaches its limit.
We decrease GC triggering frequency from 200 to 1000 allocated
references. This now only applies to other kinds of JNI References
allocated by Binder.
I saw a maximum bucket size of 16 for the ProxyMap data structure
while briefly exercising a freshly booted device. That occurred
in system_server.
Bug:
65760710
Test: Built and booted master with some debugging output. Looks sane.
Change-Id: I322c4d8e9c8e198586d591580c2cdbb094906677
Christine Franks [Wed, 25 Oct 2017 02:04:22 +0000 (19:04 -0700)]
Support native and srgb for night display
Bug:
68159303
Test: make -j100
Merged-In: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Manoj Boopathi Raj [Thu, 26 Oct 2017 18:49:02 +0000 (11:49 -0700)]
Fixed NullPointerException in IpSecService-Netd binder layer
Replaced null with empty byte array in createTransportModeTransform
for null auth.getKey, crypt.getKey() and authCrypt.getKey()
Test: Ran CTS test
Bug:
68052730
Change-Id: I5110b1297b4bfbb5766e8ecfd3d64f8110b52945
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
Jason Monk [Mon, 18 Sep 2017 14:31:37 +0000 (10:31 -0400)]
Refinement of auto-dimming nav
- Make dimming only happen for interaction with nav
- Extend time to dim
- Shorten time to start dimming by same amount.
Test: visual
Change-Id: Ieb5b31bacdde9ce1952601ad65cff2d54386dd0f
Fixes:
65694001