Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
neo.chae
85afb42c16 Fix idmap leak in zygote process am: 0244ca8d10 
am: 82537abc3b

Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f
 2016-11-09 20:13:07 +00:00
Xin Li
34de2a2d45 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev 
am: 78f15948fb

Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4
 2016-11-09 20:11:44 +00:00
Xin Li
1a06ebfcac Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev 
am: 49b144e630

Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
 2016-11-09 20:11:43 +00:00
Xin Li
eda0b0078e Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev 
am: cc115c5931

Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
 2016-11-09 20:11:42 +00:00
Xin Li
16090c6177 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. 
am: 7e0483fcec  -s ours

Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
 2016-11-09 20:11:40 +00:00
Xin Li
b9634f3081 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. 
am: 9b9906e9c0  -s ours

Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
 2016-11-09 20:11:38 +00:00
Xin Li
6166af96ba Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. 
am: ee2903686f  -s ours

Change-Id: I565953c9962f328055512615185de735c33a50bb
 2016-11-09 20:11:37 +00:00
TreeHugger Robot
c73741c36a Merge "Cleanup asserts and remove usage of deprecated data structure." 2016-11-09 19:52:58 +00:00
Sohani Rao
62f63481ed Merge "Update REQUEST_PEERS message with calling package" am: 836e74052e am: e8431a09ca am: dbacbe3fbe 
am: 6d6c885f9a  -s ours

Change-Id: I4cf30afeb45de08fd4132544861138ce45d3393f
 2016-11-09 19:48:29 +00:00
Sohani Rao
6d6c885f9a Merge "Update REQUEST_PEERS message with calling package" am: 836e74052e am: e8431a09ca 
am: dbacbe3fbe

Change-Id: Ia5df0103767d537f74f254cc12bd175f65787537
 2016-11-09 19:42:35 +00:00
Manu Cornet
48edb07a76 2-D recents: fix toggling behavior and orientation changes. 
Test: Tested behavior locally on Ryu device.
Bug: 32101881
Change-Id: I6cf1638452b96332d9a8bc376e882e9888f92bc3
 2016-11-09 11:42:11 -08:00
Damien Bargiacchi
34b94b3f4c Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev am: 7da025f142 am: bcbd1f8110 
am: 4416c7e1ca

Change-Id: I23f1976378b29068448ba40c3d67b98ebe12db55
 2016-11-09 19:34:15 +00:00
Damien Bargiacchi
9510921cc1 Allow config.xml to set the default display's default color mode am: 4364bbf93f am: 4e9436261f 
am: 9d14e6d6bd

Change-Id: Iaae647e8373b624f3e7deb7c1c54fb6b9bbd8992
 2016-11-09 19:32:58 +00:00
Sohani Rao
dbacbe3fbe Merge "Update REQUEST_PEERS message with calling package" am: 836e74052e 
am: e8431a09ca

Change-Id: If5f4f60919f2f4083f109e1609ecd1834030f1c8
 2016-11-09 19:32:06 +00:00
Sohani Rao
e8431a09ca Merge "Update REQUEST_PEERS message with calling package" 
am: 836e74052e

Change-Id: Ib22ae41f991ce68d47e2f7437984c7fa248dd235
 2016-11-09 19:26:51 +00:00
Jeff Sharkey
850c83e6da Move dump() to dumpAsync(), more oneway calls. 
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.

Test: builds, boots, runs with minimal logs triggered
Bug: 32715088
Change-Id: I70aa2666ae21dae8f09ded2063bed359c0b210c5
 2016-11-09 12:25:48 -07:00
Damien Bargiacchi
4416c7e1ca Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev am: 7da025f142 
am: bcbd1f8110

Change-Id: I6c85c5ff922eee94a2d61f7d4c92523d322d1881
 2016-11-09 19:22:29 +00:00
Damien Bargiacchi
9d14e6d6bd Allow config.xml to set the default display's default color mode am: 4364bbf93f 
am: 4e9436261f

Change-Id: Id468f9e353ae159df5cd730655fe7ce4a43696cf
 2016-11-09 19:21:29 +00:00
TreeHugger Robot
00f42c3b28 Merge "Initial implementation of the Auto-Fill Framework classes." 2016-11-09 19:19:32 +00:00
Adrian Roos
467278fd41 Merge "DozeLog: fix notification trigger logging" 2016-11-09 19:15:58 +00:00
Sohani Rao
836e74052e Merge "Update REQUEST_PEERS message with calling package" 2016-11-09 19:15:44 +00:00
Damien Bargiacchi
bcbd1f8110 Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev 
am: 7da025f142

Change-Id: I52cf76707b3273aa92d566487189db2a593bedaa
 2016-11-09 19:14:33 +00:00
Damien Bargiacchi
4e9436261f Allow config.xml to set the default display's default color mode 
am: 4364bbf93f

Change-Id: I6d68be94598f3fe28225826e00459d5707b7ecee
 2016-11-09 19:14:26 +00:00
Damien Bargiacchi
7da025f142 Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev 2016-11-09 19:05:37 +00:00
Narayan Kamath
dfcc79ee8e Zygote : Block SIGCHLD during fork. 
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.

To prevent this from happening, block SIGCHLD during this critical
section.

Bug: 32693692
Test: Manual

(cherry picked from commit e9a525829a)

Zygote: Unblock SIGCHLD in the parent after fork.

Follow up to change e9a525829a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual

(cherry picked from commit c7161f756e86b98f2244a04d9207b47149965fd7)

Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
 2016-11-09 18:30:55 +00:00
Tyler Gunn
b88b311463 Perform camera permission and app ops check when setting camera for VT. 
When a calling InCallService attempts to use the setCamera API on the
VideoCall, Telecom will perform a permission check to ensure that the
caller has the correct camera permission and passes the app-ops camera
check.  A failure to set the camera will result in a callback via the
call session event API.

This got a little messy as the app ops package name needs to come from the
InCallService, and handler usage in the VideoProvider API means we had to
pass around the uid/pid of the caller, obtained before we trampoline onto
the handler.

Test: Unit tests added, manual testing performed.
Bug: 32747443
Change-Id: I555a04f9c3fb45e60bb811f64ba855ccf2e3b0e2
 2016-11-09 10:19:23 -08:00
Derek Sollenberger
e547dd0b80 Cleanup asserts and remove usage of deprecated data structure. 
Test: compile only
Change-Id: I9e9f1a3fb37db043d76a98a9568679e7e531e283
 2016-11-09 18:04:44 +00:00
Sunny Goyal
7b0e2c7659 Fixing async inflation for nested RemoteViews 
> Fixing isRootNamespace check
> Updating ViewTree when ViewStub is inflated
> Applying ViewGroupAction on previously found views instead of finding it again
  as the viewTree might have changed.

Test: am instrument -w -e class android.widget.RemoteViewsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 32639592

Change-Id: I0815fb3a981efbc04fb0d080b81949985c2d9bc3
 2016-11-09 10:02:44 -08:00
Andreas Huber
9f0268695c Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections. 
Test: make, hidl_test_java
Bug: 32670143
Change-Id: Ia987a26fceab41cfc18fbae7c83e01dff1d9d11a
 2016-11-09 09:59:26 -08:00
TreeHugger Robot
cd06305852 Merge "Ensure that focusable stack is focused when starting a new activity." 2016-11-09 17:44:37 +00:00
TreeHugger Robot
01a9663785 Merge "Zygote: Unblock SIGCHLD in the parent after fork." 2016-11-09 17:08:55 +00:00
Derek Sollenberger
0e3cba3146 Handle vulkan windowing directly in SkiaVulkanPipeline 
Test: manual testing in skiavk mode
Change-Id: I2fab80bae2787bfdacbc70d0402e98450e59406d
 2016-11-09 11:58:36 -05:00
Jeff Sharkey
d0ac9d3bac Merge "Detect non-oneway calls leaving system_server." 2016-11-09 16:51:41 +00:00
Julia Reynolds
423b9fc83d Move notification channel from record to sbn. 
So notificationlisteners know about it.

Test: runtest systemui-notification
Change-Id: I28fc86730d3f7ad246a0164f44157594f57430c0
 2016-11-09 09:51:08 -05:00
Julia Reynolds
77b2cc920f Ranker --> Assistant. 
Rename ranker to assistant and make some of the methods public.
Delete the ext services ranker and restore the listener-type
lifecycle to the assistant.

Test: manual. add a notification assistant and verify it gets
assistant and listener callbacks.

Change-Id: Ia3406c8c14d923426c1b8a6d8b5187efe64c31c3
 2016-11-09 09:04:16 -05:00
Tamas Berghammer
67387af732 Merge "Update package names to work with the proto3 compiler" 2016-11-09 13:38:58 +00:00
Narayan Kamath
75c6b8c324 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev 2016-11-09 11:26:13 +00:00
TreeHugger Robot
2fb2556833 Merge "Allow shell to enable/disable individual component in test package" 2016-11-09 10:56:26 +00:00
Narayan Kamath
a045aed7a2 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev 
am: 7bd25ab485

Change-Id: I0266e2fe129ac5ae0c7bbd84e7890d5c41872655
 2016-11-09 10:24:57 +00:00
Narayan Kamath
f369b3ce75 Zygote: Additional whitelisting for legacy devices. 
am: 7d302e018d

Change-Id: I15f8e0ec93f502ca45a9b00d93baa66780701996
 2016-11-09 10:24:53 +00:00
Narayan Kamath
7bd25ab485 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev 2016-11-09 10:20:04 +00:00
Narayan Kamath
12f98789bf Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev 2016-11-09 09:48:43 +00:00
Narayan Kamath
b3b03a9d78 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev 2016-11-09 09:45:36 +00:00
Narayan Kamath
fd23b9d509 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev 
am: d60156dfc6

Change-Id: I3696ed3639492ae446ccd1c9ad4feaaa9e15a5ef
 2016-11-09 09:39:23 +00:00
Narayan Kamath
1e6a5d11a6 Zygote: Additional whitelists for runtime overlay / other static resources. 
am: 0ad0e859f6

Change-Id: Id24798deebb738ba6c6b6abef28ca96c0c61dc79
 2016-11-09 09:39:20 +00:00
Narayan Kamath
d60156dfc6 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev 2016-11-09 09:30:50 +00:00
Narayan Kamath
1480dc3e97 Zygote: Unblock SIGCHLD in the parent after fork. 
Follow up to change e9a525829a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Change-Id: I81fde39a2dd32eaf7d8b397672d3165a4eb945e1
Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual
 2016-11-09 09:25:03 +00:00
neo.chae
82537abc3b Fix idmap leak in zygote process 
am: 0244ca8d10

Change-Id: Ia35ded23161ad5c5c6fe4dea388e74b8d8af2955
 2016-11-09 09:21:46 +00:00
Julius D'souza
bbfdf7ad23 DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. 
Bug: 32249324

Change-Id: Ic6f08b7fa79e3a0ef88ebe9904b1f8b8acfb06d3
 2016-11-08 21:49:01 -08:00
Bill Yi
9e296952a5 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: aa13d0f09d -s ours am: 497956cf15 -s ours 
am: 1fbaeedf8c  -s ours

Change-Id: Iefa889f8c47f8f9ea1a09803836e77684feda97e
 2016-11-09 02:51:24 +00:00