OSDN Git Service
Ruchi Kandoi [Wed, 25 Jan 2017 20:07:23 +0000 (20:07 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed am:
e6cb2aa614
am:
40c14a83d0
Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
Ruchi Kandoi [Wed, 25 Jan 2017 20:03:00 +0000 (20:03 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed
am:
e6cb2aa614
Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am:
f3a6269fed
Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
Treehugger Robot [Wed, 25 Jan 2017 19:53:59 +0000 (19:53 +0000)]
Merge "nfc: Make NDEF validation stricter"
Andre Eisenbach [Wed, 25 Jan 2017 18:23:50 +0000 (18:23 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f am:
36ce9b7ea0
am:
8b1d096e58
Change-Id: I4fd28828d5ed8ec2a3e93b6f8ab074dccdcb30e2
Ruchi Kandoi [Wed, 25 Jan 2017 02:32:01 +0000 (18:32 -0800)]
nfc: Make NDEF validation stricter
- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type
Bug:
20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Andre Eisenbach [Wed, 25 Jan 2017 18:19:51 +0000 (18:19 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f
am:
36ce9b7ea0
Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2
Andre Eisenbach [Wed, 25 Jan 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
am:
35c715332f
Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089
Andre Eisenbach [Wed, 25 Jan 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
Marie Janssen [Wed, 18 Jan 2017 17:37:52 +0000 (09:37 -0800)]
Bluetooth: fix indentation, formatting in dumpsys
Before
======
Enable log:
01-17 09:43:18 Enabled by com.android.systemui
01-18 07:13:10 Disabled by com.andorid.systemui
1 BLE Apps registered:
com.google.android.gms
After
=====
Enable log:
02-06 07:49:07 Enabled by system boot
02-06 07:49:35 Disabled by com.andorid.systemui
1 BLE App registered:
com.google.android.gms
Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:47 +0000 (16:08 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
am:
a60f7151e6
Change-Id: I11be13e9f6404cc74fa44cb6a8278a019634ecf1
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:41 +0000 (16:08 +0000)]
Decrease frequency of high temp warnings
am:
97bfa0f17d
Change-Id: I48237148a12cbf8b11df798001aa5c99428a6daa
Andrew Sapperstein [Wed, 25 Jan 2017 16:01:04 +0000 (16:01 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
Tobias Thierer [Wed, 25 Jan 2017 11:44:56 +0000 (11:44 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798 am:
b8557c431d
am:
6a5fccdc66
Change-Id: I2636fb0fc54bbf0958b498494f4d587aa283b7d4
Tobias Thierer [Wed, 25 Jan 2017 11:40:33 +0000 (11:40 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798
am:
b8557c431d
Change-Id: I074661952d4d8b67cdba3038f564d29329469bab
Tobias Thierer [Wed, 25 Jan 2017 11:35:11 +0000 (11:35 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
am:
815fb54798
Change-Id: I97f0155ed743c7bc674f0241b2b07955e8d68e56
Tobias Thierer [Wed, 25 Jan 2017 11:29:42 +0000 (11:29 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
Peter Qiu [Wed, 25 Jan 2017 03:26:19 +0000 (03:26 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1 am:
55d23d0829
am:
c11689de2f
Change-Id: Icb6bd9db5058b11cc27174acf616a8d751041d1d
Peter Qiu [Wed, 25 Jan 2017 03:21:49 +0000 (03:21 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am:
123aa5d8b1
am:
55d23d0829
Change-Id: Ia7d1beb9a1ebd55a72c403f9ed159f55b491b10b
Peter Qiu [Wed, 25 Jan 2017 03:17:19 +0000 (03:17 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
am:
123aa5d8b1
Change-Id: If8164839812728361fcd3d9b2f37c481ccf9b33c
Treehugger Robot [Wed, 25 Jan 2017 03:09:08 +0000 (03:09 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
Peter Qiu [Wed, 25 Jan 2017 02:19:45 +0000 (02:19 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578 am:
6570ce6c80
am:
704f1bfea4
Change-Id: I0ad0256eb12fd4c255dd0c27d7ec8b90d42ccbdc
Peter Qiu [Wed, 25 Jan 2017 02:15:44 +0000 (02:15 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am:
28c7afe578
am:
6570ce6c80
Change-Id: I8c232cc7d246b28943d16c1f28121597dad8f215
Peter Qiu [Wed, 25 Jan 2017 02:11:10 +0000 (02:11 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
am:
28c7afe578
Change-Id: If1b097fb5b9453d1e108534c1fb088dfc92b1b6e
Treehugger Robot [Wed, 25 Jan 2017 02:02:58 +0000 (02:02 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
Andrew Sapperstein [Wed, 25 Jan 2017 00:38:50 +0000 (16:38 -0800)]
Decrease frequency of high temp warnings
Instead of showing any time the temp is above throttling temp,
if the user has dismissed the notification (or clicked it), the notification
will not reshow until the temperature has gone below the throttling
temp and come back.
Test: manual
Change-Id: I4cef9144dfcff03a5e70ccd5b12efaab1e74d15b
Fixes:
34346625
Adrian Roos [Wed, 25 Jan 2017 00:30:43 +0000 (00:30 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
am:
ae5d4ff831
Change-Id: Ib76e1da3dbd8b55ff55b3df2f040380e86fd3c35
Adrian Roos [Wed, 25 Jan 2017 00:30:35 +0000 (00:30 +0000)]
MessagingStyle: Fix buggy measure in MessagingLinearLayout
am:
4749930c37
Change-Id: Id664ebb3c07271ff5282daedd29c7f38e79c8776
TreeHugger Robot [Wed, 25 Jan 2017 00:24:33 +0000 (00:24 +0000)]
Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
Peter Qiu [Wed, 11 Jan 2017 21:39:35 +0000 (13:39 -0800)]
hotspot2: add support for complete PerProviderSubscription/Credential subtree
Added missing fields in Credential subtree for supporting Release 2
and added parsing support for the new fields.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Ic3665c963ab77ddc4b9a03262517a3c7a4ec3ffc
Peter Qiu [Wed, 11 Jan 2017 19:01:02 +0000 (11:01 -0800)]
hotspot2: add support for complete HomeSP subtree
Added missing fields in HomeSP subtree for supporting Release 2
and added parsing support for the new fields.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Id2766b6b48be8bd97b56eb7c57a0e8527f38e06c
Chris Tate [Tue, 24 Jan 2017 23:46:58 +0000 (23:46 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup" am:
36654ffef5 am:
3a13bb43f6
am:
6793b1f0b8
Change-Id: I16e1b48e818023243f2c05e43599432f59203a19
Chris Tate [Tue, 24 Jan 2017 23:42:33 +0000 (23:42 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup" am:
36654ffef5
am:
3a13bb43f6
Change-Id: I44fcb1ff849d39ff528adb85f8d76563eb9b9d52
Chris Tate [Tue, 24 Jan 2017 23:38:12 +0000 (23:38 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
am:
36654ffef5
Change-Id: I5ba75075e2fb2dae0dcabbb0cee3b83c3d0c15ea
Chris Tate [Tue, 24 Jan 2017 23:31:34 +0000 (23:31 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
Torbjorn Eklund [Tue, 24 Jan 2017 22:57:27 +0000 (22:57 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" am:
a9c27b348c am:
8e9cf51db3
am:
3cd1f5bac7
Change-Id: I7f6c497adfb1dcbfeb5342c639008af5d28d1892
Torbjorn Eklund [Tue, 24 Jan 2017 22:52:59 +0000 (22:52 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" am:
a9c27b348c
am:
8e9cf51db3
Change-Id: I7fbc47d01539202c4a9d022dc6609bc88e1d4621
Torbjorn Eklund [Tue, 24 Jan 2017 22:49:27 +0000 (22:49 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
am:
a9c27b348c
Change-Id: Ia57e460220a5f8e53f47f2454f5c1a005830a3e6
Treehugger Robot [Tue, 24 Jan 2017 22:43:31 +0000 (22:43 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
Siyamed Sinir [Tue, 24 Jan 2017 22:27:36 +0000 (22:27 +0000)]
Merge "Make SpannableStringBuilder.getSpans thread-safe" into nyc-mr2-dev
am:
9e1f4e8891
Change-Id: If12164005160599947f591ee97a1d0a9af2f732e
Siyamed Sinir [Tue, 24 Jan 2017 22:27:28 +0000 (22:27 +0000)]
Make SpannableStringBuilder.getSpans thread-safe
am:
4234144a2b
Change-Id: I9d1c2d93d6f22465c88e35df28d75f07bcc687b3
Siyamed Sinir [Tue, 24 Jan 2017 22:20:00 +0000 (22:20 +0000)]
Merge "Make SpannableStringBuilder.getSpans thread-safe" into nyc-mr2-dev
Siyamed Sinir [Tue, 24 Jan 2017 22:09:00 +0000 (22:09 +0000)]
Merge "Fix SpannableStringBuilder getSpans sort" into nyc-mr2-dev
am:
48d84c378b
Change-Id: I3935b667dd120825e13252ad13a63b027ebf4a49
Siyamed Sinir [Tue, 24 Jan 2017 22:08:56 +0000 (22:08 +0000)]
Fix SpannableStringBuilder getSpans sort
am:
051caedcaa
Change-Id: I6d4a4d3b5810d47809458bcd1e1dce9567363da6
Siyamed Sinir [Tue, 24 Jan 2017 22:05:01 +0000 (22:05 +0000)]
Merge "Fix SpannableStringBuilder getSpans sort" into nyc-mr2-dev
Torbjorn Eklund [Tue, 24 Jan 2017 20:59:25 +0000 (20:59 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" into nyc-mr2-dev
am:
5bfedd8af0
Change-Id: I06c5832785ff29e2e6b9ee835c14394c56ad4e60
Torbjorn Eklund [Tue, 24 Jan 2017 20:59:20 +0000 (20:59 +0000)]
Vodafone SIMs should treat Spain as roaming
am:
137271738e
Change-Id: Ife67a10b2cb21418c256e70869e70bf5af78840c
TreeHugger Robot [Tue, 24 Jan 2017 20:55:07 +0000 (20:55 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" into nyc-mr2-dev
Andrew Sapperstein [Tue, 24 Jan 2017 20:08:53 +0000 (20:08 +0000)]
Merge "Add Settings.Global configs to high temp warning." into nyc-mr2-dev
am:
0a26aa9b31
Change-Id: Idfd2a48cadb54adcb5f6976ec1a2caf7181db78a
Andrew Sapperstein [Tue, 24 Jan 2017 20:08:42 +0000 (20:08 +0000)]
Add Settings.Global configs to high temp warning.
am:
63db9254cf
Change-Id: I63de4c9648158d8b19ed5d7eac1e75ca9b68d355
TreeHugger Robot [Tue, 24 Jan 2017 20:02:22 +0000 (20:02 +0000)]
Merge "Add Settings.Global configs to high temp warning." into nyc-mr2-dev
Adrian Roos [Mon, 5 Dec 2016 23:42:16 +0000 (15:42 -0800)]
MessagingStyle: Fix buggy measure in MessagingLinearLayout
Fixes a bug in MessagingLinearLayout where we would not
recompute the height of it after applying the computed
insets to the text views, leading to incorrect padding
and in rare cases a cut off message at the bottom.
Change-Id: If87a527555158e94e501832e9f49e380cc7da2bb
Test: runtest -x core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java
Fixes:
31463075
(cherry picked from commit
4ac8f40d96196a2a36d7bda7d92eee9bbd4ee7e7)
Sanket Agarwal [Tue, 24 Jan 2017 19:15:17 +0000 (19:15 +0000)]
Merge "Change HFP Client API to support multi device" am:
01f2e67648 am:
aaa490025b
am:
ccf418fc4d
Change-Id: Iad5f61ad2a5e2f7ab8d8c74567eea5c519ba87ca
Sanket Agarwal [Tue, 24 Jan 2017 19:11:21 +0000 (19:11 +0000)]
Merge "Change HFP Client API to support multi device" am:
01f2e67648
am:
aaa490025b
Change-Id: I2e5a77ba5efece7af1d4be91ca795cd97e96acf3
Sanket Agarwal [Tue, 24 Jan 2017 19:06:40 +0000 (19:06 +0000)]
Merge "Change HFP Client API to support multi device"
am:
01f2e67648
Change-Id: I887b83939581fe1fd4068f7a4a72a6910c994c74
Fyodor Kupolov [Tue, 24 Jan 2017 19:04:52 +0000 (19:04 +0000)]
Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev
am:
fcb06b3735
Change-Id: I322bc1977cce2292db5b86d66eaa91519d758950
Fyodor Kupolov [Tue, 24 Jan 2017 19:04:46 +0000 (19:04 +0000)]
[DO NOT MERGE] Do not log boot times for secondary users and upgrades
am:
1cd8508ba8
Change-Id: Ie6ca85107afcc79e905a748827aef3879807fd36
Sanket Agarwal [Tue, 24 Jan 2017 19:01:13 +0000 (19:01 +0000)]
Merge "Change HFP Client API to support multi device"
TreeHugger Robot [Tue, 24 Jan 2017 18:55:13 +0000 (18:55 +0000)]
Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev
Jesse Hall [Tue, 24 Jan 2017 18:13:13 +0000 (18:13 +0000)]
Merge "Don't lower priority of EGL Init thread" into nyc-mr2-dev
am:
9294b75354
Change-Id: I8caf1f80fdbbf43198594c9072b8418f78818f09
Jesse Hall [Tue, 24 Jan 2017 18:13:07 +0000 (18:13 +0000)]
Don't lower priority of EGL Init thread
am:
37e63c705e
Change-Id: Icd21c9243558f4427d48f967f4ea4ae7aa1e2b02
Jesse Hall [Tue, 24 Jan 2017 18:08:12 +0000 (18:08 +0000)]
Merge "Don't lower priority of EGL Init thread" into nyc-mr2-dev
Paul Duffin [Tue, 24 Jan 2017 16:18:43 +0000 (16:18 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)" am:
5a3a3d298a am:
a07f9d522b
am:
5aa7e5b46f
Change-Id: I6aede1f1e2216233493cebe3efba43686aa3ad0d
Paul Duffin [Tue, 24 Jan 2017 16:12:57 +0000 (16:12 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)" am:
5a3a3d298a
am:
a07f9d522b
Change-Id: I758123e58a78ac515fb4ed0ce8e1647cfd1a3dc8
Paul Duffin [Tue, 24 Jan 2017 16:08:26 +0000 (16:08 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)"
am:
5a3a3d298a
Change-Id: I14fd4502454a98baf01f5ace83fe0c583005a52d
Paul Duffin [Tue, 24 Jan 2017 16:01:59 +0000 (16:01 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)"
Paul Duffin [Tue, 24 Jan 2017 14:28:20 +0000 (14:28 +0000)]
Prepare for removal of legacy-test from default targets (Part 2)
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug:
30188076
Test: make checkbuild
Merged-In: If507b641624a2933e722f61e815890fcdf442265
Change-Id: Icdcad50f1cc32e900bc9e882f1db2867ea170fbf
Tobias Thierer [Fri, 2 Sep 2016 14:04:54 +0000 (15:04 +0100)]
API: Update Collections to OpenJDK8u60
Bug:
29935305
Bug:
31896176
Test: make update-api
Change-Id: I94f0f8c6915fdc1c8151b816d0a988a07629e984
Joachim Sauer [Tue, 24 Jan 2017 12:46:56 +0000 (12:46 +0000)]
Merge "Expose more ICU4J APIs." am:
e5f0221f06 am:
5272231259
am:
94eb984734
Change-Id: I429dcc34cc09d8ceadb6bb6af42efce0572ed00f
Joachim Sauer [Tue, 24 Jan 2017 12:41:57 +0000 (12:41 +0000)]
Merge "Expose more ICU4J APIs." am:
e5f0221f06
am:
5272231259
Change-Id: I2714668baf99fb18d726212917a32e8e98b734a2
Joachim Sauer [Tue, 24 Jan 2017 12:35:30 +0000 (12:35 +0000)]
Merge "Expose more ICU4J APIs."
am:
e5f0221f06
Change-Id: I77e300979bdfe781ad9ab7aff5241b92491e5660
Joachim Sauer [Tue, 24 Jan 2017 12:30:11 +0000 (12:30 +0000)]
Merge "Expose more ICU4J APIs."
Erik Kline [Tue, 24 Jan 2017 08:11:51 +0000 (08:11 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am:
c1987487a2 am:
555812a3e2
am:
65e01ec4ed
Change-Id: Idfe2c34bad70e0044d7281ba9b9aaaf26f7e2fb5
Jesse Hall [Tue, 24 Jan 2017 08:09:27 +0000 (00:09 -0800)]
Don't lower priority of EGL Init thread
The EGL Init thread spends a lot of time loading shared libraries,
which involves reading pages and adjusting VM pages. Previously it was
a low priority thread, which meant that when it blocked while holding
a VM lock, it might take a while to be scheduled again once ready, so
it would hold the VM lock longer than necessary, blocking other
threads waiting on soft faults, etc. Classic priority inversion.
Leaving the thread at normal priority causes it to interfere *less*
with critical-path Activity launch work.
Bug:
34611670
Test: go/platform-startup, specifically:
./tradefed.sh run google/template/local --template:map test
google/test/performance/app-launch-perf
--post-boot-command "service call persistent_data_block 6 i32 1"
--post-boot-command "service call persistent_data_block 7 i32 1"
--apps Clock alarmclock --trial-launch --launch-iteration 10
--launch-order cyclic --drop-cache --trace-directory sdcard
--trace-iteration 2 --simple-perf-cmd "simpleperf stat -a"
--report-metrics all --force-skip-system-props --alt-dir `pwd`
Change-Id: I17647c657da64d15f40f8f2b97ee3400e1f0be7f
Erik Kline [Tue, 24 Jan 2017 08:05:25 +0000 (08:05 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am:
c1987487a2
am:
555812a3e2
Change-Id: Icac0e50bae970e7aaa9eecc3d7be3c19b2111a78
Erik Kline [Tue, 24 Jan 2017 08:00:48 +0000 (08:00 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am:
c1987487a2
Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8
Treehugger Robot [Tue, 24 Jan 2017 07:54:20 +0000 (07:54 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
Hugo Benichi [Fri, 4 Nov 2016 07:06:34 +0000 (16:06 +0900)]
DO NOT MERGE frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.
Test: $ runtest frameworks-net passes (expect Tether
Bug:
32561414
(cherry picked from commit
fa8a6f6220d1a0027ba7969c2d3f72690ddc6495)
Change-Id: I84f9aecfbf9ebe07c6fcfec26acb2c2cfaae2d60
Erik Kline [Mon, 23 Jan 2017 07:42:01 +0000 (16:42 +0900)]
All upstream mobile connection management is now in UpstreamNetworkMonitor
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ifbd430d5bf2d2191469c9810ad8f073506abde46
Chen Xu [Tue, 24 Jan 2017 02:48:00 +0000 (02:48 +0000)]
Merge "support suw and post-suw cases for default app" am:
9fc8d99c76 am:
ea55399ecc
am:
f2a5e432b0
Change-Id: Ica33178ed47d877d6ab723a42dce032456e15201
Chen Xu [Tue, 24 Jan 2017 02:43:28 +0000 (02:43 +0000)]
Merge "support suw and post-suw cases for default app" am:
9fc8d99c76
am:
ea55399ecc
Change-Id: I1b3a5c7aed8a2930ed98c81b1c2c391769d87fe5
Chen Xu [Tue, 24 Jan 2017 02:39:55 +0000 (02:39 +0000)]
Merge "support suw and post-suw cases for default app"
am:
9fc8d99c76
Change-Id: I7a451bf2cfdfd6db65208a46db9d664039297ace
Chen Xu [Tue, 24 Jan 2017 02:30:58 +0000 (02:30 +0000)]
Merge "support suw and post-suw cases for default app"
Android Build Merger (Role) [Tue, 24 Jan 2017 02:20:07 +0000 (02:20 +0000)]
Merge "Change HFP Client API to support multi device am:
c8399321e9" into nyc-mr2-dev-plus-aosp
Sanket Agarwal [Tue, 24 Jan 2017 02:18:54 +0000 (02:18 +0000)]
Change HFP Client API to support multi device
am:
c8399321e9
Change-Id: I96dd85f1bee2f39f683d6ee11b5ab4e8b9a7f217
Ta-wei Yen [Tue, 24 Jan 2017 02:18:30 +0000 (02:18 +0000)]
Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev
am:
70f920fa0c
Change-Id: If2936ae00b37750362a56975ba7c42a6c30984aa
Ta-wei Yen [Tue, 24 Jan 2017 02:18:26 +0000 (02:18 +0000)]
Fix typo in the IS_OMPT_VOICEMAIL field.
am:
57365441d4
Change-Id: I060ed862bd929875848753d77e6fc3ff8a48e32c
Fyodor Kupolov [Tue, 24 Jan 2017 01:00:29 +0000 (17:00 -0800)]
[DO NOT MERGE] Do not log boot times for secondary users and upgrades
Do not log framework_boot_completed/framework_locked_boot_completed
for secondary users, runtime restarts or first boot/upgrade.
First boot/upgrade also applies to boot_system_server_ready/
boot_package_manager_init_ready
Cherry-picked from commit
4ba91b9a879290d3d810330d172161ab1f923da8
Test: Manual update with fingerprint change
Test: runtime restart - not logged
Bug:
34516002
Bug:
32807863
Change-Id: I64b960c96a0e45b4fefaf05547ea5ac5c701c765
Andrew Sapperstein [Fri, 20 Jan 2017 23:41:03 +0000 (15:41 -0800)]
Add Settings.Global configs to high temp warning.
Test: manual
Bug:
34480261
Merged-In: Icfd08c1c7dae456920b3978918ee01469e1dec95
Change-Id: I9ed444dfb89f86d94f3a0db699324318f5bf78d0
fionaxu [Mon, 23 Jan 2017 06:43:41 +0000 (22:43 -0800)]
support suw and post-suw cases for default app
- our default carrier actions might not compatible with suw since data might be disabled
without surfacing users with an option to activate inside SuW.
- instead, skip carrier actions during setupwizard and schedule a job to resume carrier actions if needed when exit suw.
- use jobscheduler to monitor provision bit instead of keep the app running and listen for content change asynchronously.
Bug:
30958215
Test: Manual
Change-Id: Ie4004b46405b914158f585059d332f4e694053f3
Sanket Agarwal [Fri, 20 Jan 2017 22:55:15 +0000 (14:55 -0800)]
Change HFP Client API to support multi device
- Adds BluetoothDevice as a parameter where required
- Gets rid of device management APIs that can be done via
BluetoothProfiles instead
Test: Manual sanity tests
Bug: b/
33554547
Bug: b/
30984220
Change-Id: I3485ac5bfe1fcb29c774ad040fdd608e1cacb8df
(cherry picked from commit
039eeb81b5ceb5a7141ae852346e054348ac2a06)
Ta-wei Yen [Mon, 23 Jan 2017 22:40:36 +0000 (22:40 +0000)]
Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev
Siyamed Sinir [Wed, 14 Dec 2016 21:24:47 +0000 (13:24 -0800)]
Make SpannableStringBuilder.getSpans thread-safe
Add cached int buffers for sorting.
Test: All CtsTextTestCases
Merged-In: Ice0b3c3fffc541b26aca94c93fd01e30e13efe2e
Bug:
33609774
Change-Id: Ib728654a384cfc072d1c190611e4553aa8957fa8
Jeremy Joslin [Mon, 23 Jan 2017 21:42:00 +0000 (21:42 +0000)]
Merge "Mark the INetworkScoreCache as oneway." am:
edadb3efc3 am:
4fcc44dc9a
am:
ea65f9d392
Change-Id: I54af428743c036da20a0adbaa38d00ca348364fc
Nancy Zheng [Mon, 23 Jan 2017 21:38:43 +0000 (21:38 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am:
8ac1bff7e2
am:
20d79203be
Change-Id: I35ff614a3c37736913f4731f978802c2f0fb12ae
Nancy Zheng [Mon, 23 Jan 2017 21:37:38 +0000 (21:37 +0000)]
Query for the settings package in KeyguardManager instead of hardcoding it. am:
e256a18dcd
am:
11bdbd1145
Change-Id: I946ee02b4d1b5b1286754b2cf233237cbd3b0f31
Nancy Zheng [Mon, 23 Jan 2017 21:35:41 +0000 (21:35 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am:
8ac1bff7e2
am:
d0c5f0047f
Change-Id: I96db2a0bf55871df53f6f7220bac2cdd262cee4b
Jeremy Joslin [Mon, 23 Jan 2017 21:35:27 +0000 (21:35 +0000)]
Merge "Mark the INetworkScoreCache as oneway." am:
edadb3efc3
am:
4fcc44dc9a
Change-Id: I4d2dc6446f347643f654799094ac7f6fb7529438
Nancy Zheng [Mon, 23 Jan 2017 21:34:45 +0000 (21:34 +0000)]
Query for the settings package in KeyguardManager instead of hardcoding it. am:
e256a18dcd
am:
ed92230c38
Change-Id: I41ef0f14cbd3f7e19e6fde0cdf636619683704a2
Nancy Zheng [Mon, 23 Jan 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev
am:
8ac1bff7e2
Change-Id: I2e4f9b4ea73ff5d0491b8cfda889a57aaac413ff