songjinshi
78a3d9dab4
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3
...
am: 36bcc913f7
Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd
2017-02-08 20:28:48 +00:00
songjinshi
36bcc913f7
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
...
am: ec69bd0aa3
Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
2017-02-08 20:22:26 +00:00
Paul Duffin
c02f6bb64b
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45
...
am: 9250814fd2
Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
2017-02-08 20:18:34 +00:00
songjinshi
ec69bd0aa3
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
...
am: b6f7a85b85
Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
2017-02-08 20:18:13 +00:00
Treehugger Robot
b6f7a85b85
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
2017-02-08 20:11:23 +00:00
Paul Duffin
9250814fd2
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a
...
am: 9e99b9ee45
Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
2017-02-08 18:30:17 +00:00
Paul Duffin
9e99b9ee45
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
...
am: 78a20be77a
Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
2017-02-08 18:14:50 +00:00
Paul Duffin
78a20be77a
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
2017-02-08 18:06:08 +00:00
Paul Duffin
d0a937e84b
Merge "Fix problem with JavaDoc" am: 8f33fcdc4b am: 4929aafc1d
...
am: 290274df0d
Change-Id: I4e9ef88d6aa6c69a35b6b995ebf0b90214aef79d
2017-02-08 11:39:15 +00:00
Paul Duffin
290274df0d
Merge "Fix problem with JavaDoc" am: 8f33fcdc4b
...
am: 4929aafc1d
Change-Id: I08c9f20c34a2952105854d107b442884dba220b1
2017-02-08 11:35:19 +00:00
Paul Duffin
4929aafc1d
Merge "Fix problem with JavaDoc"
...
am: 8f33fcdc4b
Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317
2017-02-08 11:31:15 +00:00
Paul Duffin
b5c09b5487
Fix problem with JavaDoc
...
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
2017-02-08 09:16:18 +00:00
Shreyas Basarge
faf365dd5e
Fix requiresCharging false value ignored issue
...
am: e33c3c81af
Change-Id: Ia96915b00e274ed6c7c8fdaea46ee5a0ba83bdcb
2017-02-08 00:58:47 +00:00
songjinshi
e02e3ea7f9
[Debug]: Add timeout for dumpNativeBacktraceToFile.
...
If the debuggerd be blocked, the watchdog and
activitymanager thread will be blocked when the
ANR or watchdog occurs,so we needed to add
timeout for dumpNativeBacktraceToFile.
Change-Id: Iab1a64328e70257025d860638d93a4fb8eaaeea2
Signed-off-by: songjinshi <songjinshi@xiaomi.com >
2017-02-07 19:17:45 +00:00
Paul Duffin
3e5fbca0c5
Replace com.android.internal.util.Predicate with java.util.function.Predicate
...
Bug: 35089332
Bug: 30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
2017-02-07 16:57:54 +00:00
Charles He
9b734a7c4c
Fingerprint: get auth id for non-current user.
...
am: aae60473e1
Change-Id: I547076caaa27d86d682addc14106a344a1b4cec9
2017-02-07 01:20:42 +00:00
Charles He
aae60473e1
Fingerprint: get auth id for non-current user.
...
Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.
Bug: 33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9
2017-02-07 01:02:51 +00:00
Pavlin Radoslavov
537eaf0f6e
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d
...
am: b7067e2b6c
Change-Id: I459480c5bf8e512340d95452c491e9e2986a84a8
2017-02-07 00:18:40 +00:00
Pavlin Radoslavov
b7067e2b6c
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
...
am: cd6e0ee19d
Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
2017-02-07 00:10:21 +00:00
Justin Klaassen
46d3d6d313
Remove experimental twilight-based automatic brightness
...
am: 614f40ea01
Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452
2017-02-06 23:28:27 +00:00
Pavlin Radoslavov
cd6e0ee19d
Merge "Add a mechanism to configure the default A2DP codec priorities"
...
am: acf34d8b62
Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea
2017-02-06 23:12:23 +00:00
Ying Wai (Daniel) Fan
df6a737108
Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8
...
am: 63f3dbae3c
Change-Id: I1c97aa2e4c0bbc84c547e4ce3ff98b77c5bba3f4
2017-02-06 23:02:08 +00:00
Ying Wai (Daniel) Fan
63f3dbae3c
Prevent division-by-zero error when calculating battery capacity.
...
am: 415f8b32e8
Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
2017-02-06 22:57:23 +00:00
Pavlin Radoslavov
2199339c39
Add a mechanism to configure the default A2DP codec priorities
...
Previously, the relative codec priorities were hard-codec internally.
The new mechanism uses the following configurable resources in
packages/apps/Bluetooth/res/values/config.xml to re-assign the
default codec priorities per device, or to explicitly disable a codec.
- a2dp_source_codec_priority_sbc
- a2dp_source_codec_priority_aac
- a2dp_source_codec_priority_aptx
- a2dp_source_codec_priority_aptx_hd
- a2dp_source_codec_priority_ldac
Those values are assigned on startup.
Also, they can be changed per device by using an overlay:
device/<VENDOR>/<DEVICE>/overlay/packages/apps/Bluetooth/res/values/config.xml
Test: Manually streaming to a headset
Change-Id: Ic4da3a51ac73f00cbae731156cb7878c8fadee06
2017-02-06 13:07:23 -08:00
Shreyas Basarge
e33c3c81af
Fix requiresCharging false value ignored issue
...
If a SyncRequest builder is used to create a sync
request and setRequiresCharging(bool) is used,
the sync request requires charging irrespective of
the boolean value provided. This cl fixes the issue.
Bug: 35027396
Test: Tested manually by looking for the charging bit in jobscheduler
dumpsys.
Change-Id: I8f642597a64b8964665f41f5ce9ca71529634069
(cherry picked from commit 3a147230a4 )
2017-02-06 20:11:42 +00:00
Aga Madurska
65f351d923
Use correct APIs to detect conditions for round scrollbars. am: 99485ef841
...
am: 50bc6a1998
Change-Id: Iab07814fd54b35705a20088e29c78a56ea943eba
2017-02-06 19:40:50 +00:00
Aga Madurska
9e7a8688c1
Use correct APIs to detect conditions for round scrollbars.
...
am: 99485ef841
Change-Id: I8aaa6bf17e253f6178b96c6743ff7779d5f3b7ef
2017-02-06 19:37:04 +00:00
Aga Madurska
50bc6a1998
Use correct APIs to detect conditions for round scrollbars.
...
am: 99485ef841
Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2
2017-02-06 19:37:00 +00:00
Ying Wai (Daniel) Fan
415f8b32e8
Prevent division-by-zero error when calculating battery capacity.
...
Bug: 34255953
Change-Id: Ie072cd5dc26faf17e8ab46ea0795750396f087c2
Fixes: 34255953
Test: formula change CL. No existing unit tests found.
2017-02-06 18:20:40 +00:00
Pavel Grafov
c3beac34f6
Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74
...
am: 5a474b4930
Change-Id: If1731db386157b1f53c3a7bbe379299c1ada0ca9
2017-02-06 17:52:37 +00:00
Pavel Grafov
5a474b4930
Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
...
am: fca679ff74
Change-Id: Ic6e2aab590583c501fa74317ee614ab1ebaea378
2017-02-06 17:46:11 +00:00
Pavel Grafov
1bb00e0849
Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
...
am: fca679ff74
Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8
2017-02-06 17:46:09 +00:00
Pavel Grafov
fca679ff74
Fix the documentation for SecurityLog.SecurityEvent.getData().
...
am: 739cda8f31
Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
2017-02-06 17:41:08 +00:00
Jason Monk
6e8c039e24
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e am: 74a8b6543f
...
am: a8e10e5f20
Change-Id: I1585be50ecf4409f552b5ef5c91de1092a01e199
2017-02-06 15:52:04 +00:00
Jason Monk
a8e10e5f20
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e
...
am: 74a8b6543f
Change-Id: If195ccf536a45ef21e8ee70547ea76e26732c583
2017-02-06 15:47:39 +00:00
Jason Monk
74a8b6543f
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
...
am: ff1d8da55e
Change-Id: I173b94730ae02f3e9b0638aac9f43972b59e10f3
2017-02-06 15:43:04 +00:00
Aga Madurska
99485ef841
Use correct APIs to detect conditions for round scrollbars.
...
Bug: 34876394
Test: Performed manually.
Change-Id: I9e690e99fd8d925c589ebd19d9c6754eeb63b1d8
2017-02-06 12:33:36 +00:00
Akira Oshimi
8d2e9a9b30
Add tile information to ACTION_QS_TILE_PREFERENCES intent
...
One application can provide two or more custom Quick Settings tiles.
But there is no way to know which tile is long-pressed from application
side because ACTION_QS_TILE_PREFERENCES intent that is sent when
long-pressed doesn't have any additional information. So the component
name and state of the tile should be added to the intent.
Bug: 34832801
Test: manual - long press a custom tile
Change-Id: Iaa884cd944f19a2f007cbde645e8f8b1198bffb7
2017-02-06 04:45:13 +00:00
Hakan Seyalioglu
531def93f0
DO NOT MERGE - Check exported status in chooser
...
am: e3286c3145
Change-Id: I55a6e9ed942a4542dcdf497e297654b666d88fb0
2017-02-02 20:16:23 +00:00
TreeHugger Robot
a5a296e661
Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev
2017-02-02 20:10:52 +00:00
Philip P. Moltmann
416a36a83b
[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms
...
am: 2fc44947dd
Change-Id: Ie0bb1c0c23928318cbaf3dc22ca0aa6761bbfa75
2017-02-02 19:21:40 +00:00
Paul Lawrence
fde0a41065
Install seccomp into zygote not init am: ef85477470 am: 521d25294b
...
am: e6e8c7a1dd
Change-Id: I97d2843a2c2940b558f216cf550891a80963be54
2017-02-02 18:37:22 +00:00
Paul Lawrence
e6e8c7a1dd
Install seccomp into zygote not init am: ef85477470
...
am: 521d25294b
Change-Id: I7c2c84a5bd67490070777d11d7f930c5dba90cbe
2017-02-02 18:30:49 +00:00
Hakan Seyalioglu
e3286c3145
DO NOT MERGE - Check exported status in chooser
...
Relevant change in master is ag/1844170
bug: 34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
2017-02-02 10:28:33 -08:00
Paul Lawrence
521d25294b
Install seccomp into zygote not init
...
am: ef85477470
Change-Id: I22745a759cc4f9797cb3c806bbdd4d69d6cccdcb
2017-02-02 18:18:08 +00:00
Paul Lawrence
ef85477470
Install seccomp into zygote not init
...
Bug: 34710876
Test: Boots, correct size filter installed, blocks unallowed calls
Change-Id: I3e66e8724ace37f7d30451b98a5e574766252ea0
2017-02-02 17:45:11 +00:00
Justin Klaassen
614f40ea01
Remove experimental twilight-based automatic brightness
...
Bug: 31602449
Test: verified adaptive brightness no longer varies with twilight with
"brightness_use_twilight" set to "1".
Merged-In: I6b5f7310020b2128c2b292414a205b6052270a0a
Change-Id: Ife9bf6d0f76df791cb7e6a22505d9f551da19731
2017-02-02 09:23:49 -08:00
Pavel Grafov
739cda8f31
Fix the documentation for SecurityLog.SecurityEvent.getData().
...
If the payload contains more than one object, it is passed in Object[].
Change-Id: I28ca2ec35d920c644bdea13f15b2787ef3170310
Fixes: 34871284
Test: Read aloud, sounds good.
2017-02-02 12:47:53 +00:00
Erik Kline
c700509ade
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259
...
am: 7196e935a8
Change-Id: I2ab05143299f13012dc2a88efca52160e08c6d97
2017-02-02 07:32:09 +00:00
Erik Kline
7196e935a8
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe
...
am: 6f32aa0259
Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
2017-02-02 07:27:13 +00:00