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
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
Chen Xu
fcb37ffc60
Merge "move ACTION_CARRIER_SETUP intent to public api"
2017-02-25 01:05:30 +00:00
Etan Cohen
7c9c4785fc
[AWARE] Remove (hide) sendMessage with retryCount API
...
Remove the sendMessage(..., retryCount) API (the version
without retryCount) remains. Baseline API already retries
transmissions (at the PHY/MAC layers) - no reason to add
framework-layer retries.
Bug: 35755823
Test: unit tests and integration (sl4a) tests
Change-Id: I49d8bd1e836c09d56f3a9343313f5647eac5c32d
2017-02-24 14:17:51 -08:00
Amit Mahajan
2225e56bd3
Merge "Mark oemhook related APIs @Deprecated." am: 79faa72eee
...
am: 4b026b656d
2017-02-24 20:53:35 +00:00
Amit Mahajan
4b026b656d
Merge "Mark oemhook related APIs @Deprecated."
...
am: 79faa72eee
2017-02-24 20:48:10 +00:00
Treehugger Robot
79faa72eee
Merge "Mark oemhook related APIs @Deprecated."
2017-02-24 20:40:23 +00:00
Josh Gao
ade5ac01f1
Merge "Open /data/anr/traces.txt with O_APPEND." am: 5bf8540194
...
am: 0b9df3a012
2017-02-24 20:33:00 +00:00
Josh Gao
0b9df3a012
Merge "Open /data/anr/traces.txt with O_APPEND."
...
am: 5bf8540194
2017-02-24 20:28:00 +00:00
Josh Gao
5bf8540194
Merge "Open /data/anr/traces.txt with O_APPEND."
2017-02-24 20:17:23 +00:00
Josh Gao
6443a858a6
Open /data/anr/traces.txt with O_APPEND.
...
Should fix selinux denial:
audit(0.0:7893): avc: denied { write } for path="/data/anr/traces.txt" dev="sda35" ino=679938 scontext=u:r:crash_dump:s0 tcontext=u:object_r:anr_data_file:s0 tclass=file permissive=0
Bug: 35727090
Test: none
Change-Id: I5c131ca1ee48ed00934a9aa7c611ee35fc4f9f2a
2017-02-24 12:15:15 -08:00
Eric Laurent
38a7f7f1ef
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic" am: 70bc4a8036
...
am: 330ac1223a
2017-02-24 19:49:55 +00:00
Eric Laurent
330ac1223a
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
...
am: 70bc4a8036
2017-02-24 19:45:28 +00:00
Eric Laurent
70bc4a8036
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
2017-02-24 19:36:29 +00:00
Mukesh Agrawal
313604b48f
Merge "StateMachine: add getLogRecMaxSize()" am: 22e43471ed
...
am: 0a2d5cf7db
2017-02-24 19:36:23 +00:00
Mukesh Agrawal
0a2d5cf7db
Merge "StateMachine: add getLogRecMaxSize()"
...
am: 22e43471ed
2017-02-24 19:32:03 +00:00
Mukesh Agrawal
22e43471ed
Merge "StateMachine: add getLogRecMaxSize()"
2017-02-24 19:26:48 +00:00
Roozbeh Pournader
e626fb53e2
Load hyphenation patterns for Bulgarian and Church Slavonic
...
Patterns for Bulgarian (bg) and Church Slavonic (cu) are now loaded
too.
Also make changes to fontchain_lint.py, so it knows the script for Bulgarian
and Church Slavonic is Cyrillic.
Test: make -j works and creates .hyb files for bg and cu
Change-Id: I0586f6c49380279ef88fe952b5cfd2d3594c5524
2017-02-24 11:23:48 -08:00
Alex Light
96b1fb4faa
Merge "Update api for InMemoryDexClassLoader" am: 2f40b2b302
...
am: c878255b5f
2017-02-24 18:43:56 +00:00
Alex Light
c878255b5f
Merge "Update api for InMemoryDexClassLoader"
...
am: 2f40b2b302
2017-02-24 18:39:00 +00:00
fionaxu
6a5ac3b922
move ACTION_CARRIER_SETUP intent to public api
...
As per CDD: The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs
Bug: 33679956
Test: Manual
Change-Id: I202398f868d35e7e9046e7cc41330a3c26dca0b0
Merged-in: Ie2b5d072406513f04676210d08c43d91623c3cd2
2017-02-24 10:34:07 -08:00
Treehugger Robot
2f40b2b302
Merge "Update api for InMemoryDexClassLoader"
2017-02-24 18:32:22 +00:00
