George Burgess IV
0d0ccb0c19
Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad
...
am: 43fd84a03c
2017-03-01 01:58:36 +00:00
George Burgess IV
43fd84a03c
Merge "Fix memory-leak warnings from the static analyzer"
...
am: 2006bfc9ad
2017-03-01 01:53:27 +00:00
Treehugger Robot
2006bfc9ad
Merge "Fix memory-leak warnings from the static analyzer"
2017-03-01 01:45:52 +00:00
Hall Liu
f000639f82
Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377
...
am: c284379659
2017-03-01 01:05:58 +00:00
Hall Liu
c284379659
Merge "Add @hide to RttAudioMode IntDef"
...
am: 22af0f3377
2017-03-01 01:01:29 +00:00
Hall Liu
22af0f3377
Merge "Add @hide to RttAudioMode IntDef"
2017-03-01 00:51:38 +00:00
George Burgess IV
18f307aed3
Fix memory-leak warnings from the static analyzer
...
Warnings:
frameworks/base/core/jni/android_view_InputChannel.cpp:145:5: warning:
Potential memory leak
jobject serverChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
frameworks/base/core/jni/android_view_InputChannel.cpp:151:5: warning:
Potential memory leak
jobject clientChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
The warnings were complaining about that we might leak
nativeInputChannel, in android_view_InputChannel_createInputChannel,
since we're allocating it as an arg and not always putting it somewhere.
Bug: None
Test: Builds without warnings
Change-Id: I62163adee5d420ad78c8d4c74aafefc8a58f765b
2017-03-01 00:08:04 +00:00
Hall Liu
07094df24a
Add @hide to RttAudioMode IntDef
...
IntDefs apparently require an @hide annotation to avoid breaking CTS
tests. Adding it here.
Change-Id: Ifd748b55e68091132571df7e74fdb797bd6a83fc
Test: CTS
Fix: 35808951
2017-02-28 15:18:31 -08:00
Brad Ebinger
81f7d06a5e
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20
...
am: 59282ad8df
2017-02-28 22:55:55 +00:00
Brad Ebinger
59282ad8df
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
...
am: b987777f20
2017-02-28 22:50:38 +00:00
Brad Ebinger
b987777f20
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
2017-02-28 22:44:56 +00:00
Andre Eisenbach
5c44929f79
Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301
...
am: add7c533c6
2017-02-28 19:29:07 +00:00
Andre Eisenbach
add7c533c6
Merge "Bluetooth: fix enable log: display 24h time"
...
am: 17cb857301
2017-02-28 19:14:58 +00:00
Andre Eisenbach
17cb857301
Merge "Bluetooth: fix enable log: display 24h time"
2017-02-28 19:04:13 +00:00
Marie Janssen
6837ead33d
Bluetooth: fix enable log: display 24h time
...
Test: adb bugreport at 1pm, observe 13:xx:yy instead of 01:xx:yy
Change-Id: I172dcc63f0f43563ec692349a9434f63c55eac25
2017-02-28 19:02:21 +00:00
Brad Ebinger
e0a7345c6a
Send the IMS_SERVICE_UP intent when it is STATE_READY
...
The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.
Also, add READ_PRIVILEGED_PHONE_STATE check
Bug: 35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62
2017-02-28 10:56:14 -08:00
Amin Shaikh
a9bace4f2c
Merge "Setting for RecommendedNetworkEvaluator cache TTL" am: 924878a752
...
am: 8bd0af0210
2017-02-28 17:16:35 +00:00
Amin Shaikh
8bd0af0210
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
...
am: 924878a752
2017-02-28 17:11:35 +00:00
Treehugger Robot
924878a752
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
2017-02-28 17:05:45 +00:00
Paul Lawrence
310c26ee6d
Merge "Move seccomp policy logic to bionic" am: ef64558393
...
am: da6d5f702d
2017-02-28 15:47:48 +00:00
Paul Lawrence
da6d5f702d
Merge "Move seccomp policy logic to bionic"
...
am: ef64558393
2017-02-28 15:41:57 +00:00
Treehugger Robot
ef64558393
Merge "Move seccomp policy logic to bionic"
2017-02-28 15:36:08 +00:00
Amin Shaikh
21496f6ee1
Setting for RecommendedNetworkEvaluator cache TTL
...
Bug: 19948759
Bug: 33694078
Test: runtest frameworks-core
Change-Id: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Merged-In: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
2017-02-27 21:49:05 -08:00
Brad Ebinger
055adc457a
Merge "Adds read/modify permission checks to ImsService" am: 3e64003641
...
am: 175213e1ee
2017-02-27 21:30:19 +00:00
Brad Ebinger
175213e1ee
Merge "Adds read/modify permission checks to ImsService"
...
am: 3e64003641
2017-02-27 21:26:50 +00:00
Brad Ebinger
3e64003641
Merge "Adds read/modify permission checks to ImsService"
2017-02-27 21:19:18 +00:00
Julius D'souza
5792d09b3d
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am: 106f1443c1 -s ours
...
am: 8beca4cc6f
2017-02-27 19:18:11 +00:00
Julius D'souza
8beca4cc6f
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on.
...
am: 106f1443c1
2017-02-27 19:14:07 +00:00
Etan Cohen
07864e35c8
Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am: f81911bcd2
...
am: 97bf0f5e9b
2017-02-27 18:46:11 +00:00
Etan Cohen
97bf0f5e9b
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
...
am: f81911bcd2
2017-02-27 18:42:05 +00:00
Etan Cohen
f81911bcd2
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
2017-02-27 18:33:35 +00:00
Paul Lawrence
08b93c1e97
Move seccomp policy logic to bionic
...
Test: Make sure builds, runs, seccomp policy still applied
Bug: 35720753
Change-Id: Ieb09dd88cf070d4b4f1277d1a88d0ce250bb05b4
2017-02-27 09:35:18 -08:00
Paul Lawrence
8084e15ad6
Merge "Revert "Move seccomp policy logic to bionic"" am: 4ebce43b37
...
am: a853184575
2017-02-27 16:51:06 +00:00
Paul Lawrence
a853184575
Merge "Revert "Move seccomp policy logic to bionic""
...
am: 4ebce43b37
2017-02-27 16:47:12 +00:00
Paul Lawrence
4ebce43b37
Merge "Revert "Move seccomp policy logic to bionic""
2017-02-27 16:39:12 +00:00
Paul Lawrence
be0d6a6890
Revert "Move seccomp policy logic to bionic"
...
This reverts commit 48c30ef529
2017-02-27 16:35:53 +00:00
Paul Lawrence
1a6a6f0277
Merge "Move seccomp policy logic to bionic" am: 7ed4ca9032
...
am: d97791e74f
2017-02-27 16:22:11 +00:00
Paul Lawrence
d97791e74f
Merge "Move seccomp policy logic to bionic"
...
am: 7ed4ca9032
2017-02-27 16:15:38 +00:00
Paul Lawrence
7ed4ca9032
Merge "Move seccomp policy logic to bionic"
2017-02-27 16:09:39 +00:00
Tyler Gunn
9b59cc7bad
Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be
...
am: 2f96f34373
2017-02-27 03:05:21 +00:00
Tyler Gunn
2f96f34373
Merge "Fix videoStateToString for audio/paused state."
...
am: 89e7a888be
2017-02-27 03:01:08 +00:00
Tyler Gunn
a84292c9d7
Merge "Format Japanese numbers using national format when in Japan." am: 050e5ddb4f
...
am: 8ac499fbe6
2017-02-27 02:59:21 +00:00
Tyler Gunn
89e7a888be
Merge "Fix videoStateToString for audio/paused state."
2017-02-27 02:55:25 +00:00
Tyler Gunn
8ac499fbe6
Merge "Format Japanese numbers using national format when in Japan."
...
am: 050e5ddb4f
2017-02-27 02:54:49 +00:00
Tyler Gunn
050e5ddb4f
Merge "Format Japanese numbers using national format when in Japan."
2017-02-27 02:48:11 +00:00
Jack Yu
9080d6708d
resolve merge conflicts of e091985bb5 to stage-aosp-master
...
am: 82c46d11f6
2017-02-25 04:58:12 +00:00
Jack Yu
82c46d11f6
resolve merge conflicts of e091985bb5 to stage-aosp-master
...
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
2017-02-24 18:47:01 -08:00
Chen Xu
9897cc4369
Merge "move ACTION_CARRIER_SETUP intent to public api" am: fcb37ffc60
...
am: f4854018a2
2017-02-25 01:17:31 +00:00
Treehugger Robot
e091985bb5
Merge "Added a settings for CMAS message broadcast"
2017-02-25 01:13:29 +00:00
Chen Xu
f4854018a2
Merge "move ACTION_CARRIER_SETUP intent to public api"
...
am: fcb37ffc60
2017-02-25 01:12:09 +00:00
