drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309,070 Commits 1 Branch 0 Tags
Commit Graph

309070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Carr
8009012644 Revert "SurfaceView: Include surfaceInsets in position calculation" 
This reverts commit 8c31e1db2a2cea4278503d6b9b27bca87946ef36.

Change-Id: Id25f493ca272878c2105f9cd302db1e05284998d
 2017-03-03 01:15:36 +00:00
Robert Carr
8c31e1db2a SurfaceView: Include surfaceInsets in position calculation 
Previously the WM was taking care of this.

Fixes: 35588318
Fixes: 34888808
Test: Manual
Change-Id: I8b48d89f830bbef43b0132d191b29552e9c35702
 2017-03-02 10:38:40 -08:00
Peng Xu
555bf41049 Merge "Add direct sensor report NDK API" 2017-03-01 17:58:36 +00:00
Android Build Merger (Role)
abe498d16d Merge "Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a am: 756216fdf9" 2017-03-01 17:55:44 +00:00
Etan Cohen
22b1dce10e Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a 
am: 756216fdf9

Change-Id: I5cdfbac3dafeecde732ea641cfcfee34c5e376ed
 2017-03-01 17:54:35 +00:00
Sergey Vasilinets
6013cf64aa Merge "Fix premultiplied flag for hardware bitmaps" 2017-03-01 17:54:08 +00:00
Geoffrey Pitsch
2cda00e29a Merge "Channels for Frameworks notifications" 2017-03-01 17:51:23 +00:00
Etan Cohen
756216fdf9 Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 
am: b50d958c4a

Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb
 2017-03-01 17:49:32 +00:00
Rob Carr
0e06ccf488 Merge "Modify SurfaceView to use SurfaceFlinger child surfaces." 2017-03-01 17:49:27 +00:00
Etan Cohen
b50d958c4a Merge "[AWARE] Add data-path security configuration (PMK)" 
am: eff6f4fc43

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886
 2017-03-01 17:45:42 +00:00
Etan Cohen
eff6f4fc43 Merge "[AWARE] Add data-path security configuration (PMK)" 2017-03-01 17:39:15 +00:00
TreeHugger Robot
e2a3c4e8c4 Merge "Reduce flakes." 2017-03-01 17:37:41 +00:00
TreeHugger Robot
72c668924a Merge "Avoid deadlock when installing app" 2017-03-01 17:30:12 +00:00
Tyler Gunn
34c4cca60f resolve merge conflicts of 81a28efd1b16 to stage-aosp-master am: b455f0deed 
am: 63700b7a8f  -s ours

Change-Id: I485e67447ad5004410ae1d719a4b48baed606517
 2017-03-01 17:03:04 +00:00
TreeHugger Robot
7381e6eb21 Merge "Expose isInstantApp() to more callers" 2017-03-01 16:58:37 +00:00
Tyler Gunn
63700b7a8f resolve merge conflicts of 81a28efd1b16 to stage-aosp-master 
am: b455f0deed

Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f
 2017-03-01 16:51:27 +00:00
Tyler Gunn
b455f0deed resolve merge conflicts of 81a28efd1b16 to stage-aosp-master 
Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d
 2017-03-01 08:44:32 -08:00
Diego Perez
ef1337aca2 Merge "Rename android.os.Build so it can be dynamically generated" 2017-03-01 16:11:15 +00:00
Tyler Gunn
81a28efd1b Merge "Support confirmation of international calls while on WFC only." 2017-03-01 16:08:40 +00:00
Julia Reynolds
4024b6696c Reduce flakes. 
Test: runtest systemui-notifications
Change-Id: I48dc8be786246e6c639a14b16784a394eac49a6b
 2017-03-01 15:54:52 +00:00
Shunta Sato
55af6c5f70 Avoid deadlock when installing app 
Symptom:
System crash is occurred by deadlock

Root cause:
ActivityManagerService's APIs usually hold a lock of itself instance.

In this case, four threads tried to take the same lock and it caused
deadlock.
Following three objects are in a three-cornered deadlocked.
- ActivityManagerService's instance
- PackageInstallerSession.mLock
- PackageManagerService.mPackages

Solution:
Call checkUidPermission before taking a lock of ActivityManagerService's
instance.

Fixes: 32425801
Test: manual
Author: Kazuki Nakayama <kazuki.x.nakayama@sonymobile.com>
Change-Id: I71ce57b1b8f3e0e9ba64b94a7b1f210b702efb6a
 2017-03-01 07:52:13 -08:00
Etan Cohen
954111a252 [AWARE] Add data-path security configuration (PMK) 
Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.

Clarify the default API to mean open (unencrypted) data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9
 2017-03-01 07:35:35 -08:00
Geoffrey Pitsch
af759c52ce Channels for Frameworks notifications 
Adapts all notifications used by system services to use channels.
Channels are initialized by SystemServer after the NotificationService
has started.

Test: runtest systemui-notification
Change-Id: I25c45293b786adb57787aeab4c2613c9d7c89dab
 2017-03-01 10:17:15 -05:00
Nathan Harold
9ac082f8bb Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816 am: 0a6305d5dd 
am: 3ddaf3e6b0

Change-Id: Idceae0e5a1af2f357378b03fc0d257dab605b217
 2017-03-01 14:22:57 +00:00
Diego Perez
9a7be3a3eb Rename android.os.Build so it can be dynamically generated 
This will allow the android.os.Build class to be generated dynamically
from the Studio side.
In order to allow the "refactoring" of classses like android.os.Build,
Create needed to be modified.

While adding the test, I've also done a small clean-up of the
AsmGeneratorTest to re-use some code.

Bug: http://b.android.com/210345
Test: Added new test to AsmGeneratorTest
Change-Id: Ie4e1209c1c60b7a33cb427dbd556a9741ec8f8b3
 2017-03-01 14:21:01 +00:00
Nathan Harold
3ddaf3e6b0 Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816 
am: 0a6305d5dd

Change-Id: Ie1798e4d7dda91a970db40e078016fcbcf89149f
 2017-03-01 14:17:46 +00:00
Nathan Harold
0a6305d5dd Merge "Add API Surface for creating IpSec Transforms" 
am: 7645fa2816

Change-Id: Ibe70a60c5c5808a7877145cccefcc1f11bfacc51
 2017-03-01 14:12:55 +00:00
Treehugger Robot
7645fa2816 Merge "Add API Surface for creating IpSec Transforms" 2017-03-01 14:05:48 +00:00
Erik Kline
23e6ad0eda Merge "Fix dead lock in Tethering state machine" am: 355dbae680 am: 0703f03953 
am: 83385ed04a

Change-Id: I7d0974d5ec4e3cab1581e1cce0e01eeb6bf7448a
 2017-03-01 11:55:44 +00:00
Erik Kline
83385ed04a Merge "Fix dead lock in Tethering state machine" am: 355dbae680 
am: 0703f03953

Change-Id: I233d796cf67a71ebc43970f949930de46a0ddb3f
 2017-03-01 11:50:41 +00:00
Erik Kline
0703f03953 Merge "Fix dead lock in Tethering state machine" 
am: 355dbae680

Change-Id: Idd08726f3eeebba49a9ad909464377af67600d30
 2017-03-01 11:46:10 +00:00
Erik Kline
355dbae680 Merge "Fix dead lock in Tethering state machine" 2017-03-01 11:40:03 +00:00
Erik Kline
df71c58341 Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d am: 47d8385184 
am: 02310829cf

Change-Id: I0264a471312423e896a1c2f479c0eeda737a1567
 2017-03-01 11:13:14 +00:00
Erik Kline
02310829cf Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d 
am: 47d8385184

Change-Id: I19ff91b1397abe20920bbae8aa6c976c6bcac0ba
 2017-03-01 11:08:06 +00:00
Erik Kline
47d8385184 Merge "Also test for additional NetworkCallback calls" 
am: dff6c5c30d

Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846
 2017-03-01 11:03:08 +00:00
Treehugger Robot
dff6c5c30d Merge "Also test for additional NetworkCallback calls" 2017-03-01 10:55:35 +00:00
TreeHugger Robot
5f9ba4e68e Merge "More accurate cascading submenu position" 2017-03-01 09:45:31 +00:00
Erik Kline
1d3db32708 Also test for additional NetworkCallback calls 
Specifcally:
    - onCapabilitiesChanged
    - onLinkPropertiesChanged
    - onNetworkSuspended

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c
 2017-03-01 18:24:36 +09:00
TreeHugger Robot
983552d03e Merge "Move some static methods from NPMS to NPM class." 2017-03-01 08:38:46 +00:00
TreeHugger Robot
4825116c10 Merge "Fix default value for mUidState.get." 2017-03-01 06:38:14 +00:00
TreeHugger Robot
52473267a7 Merge "AudioService: fix volume shaper release" 2017-03-01 06:19:19 +00:00
Nathan Harold
330e1089da Add API Surface for creating IpSec Transforms 
This CL adds an API to set up an IPSec Security Association
and Security Policy to perform Transport-Mode and Tunnel-Mode encapuslation
of IP Packets.

Bug: 30984788
Bug: 34811752
Test: 34812052, 34811227
Change-Id: Ic9f63c7bb366302a24baa3e1b79020210910ac0a
 2017-02-28 22:01:20 -08:00
TreeHugger Robot
eaff891f01 Merge "set bounds" 2017-03-01 02:24:33 +00:00
George Burgess IV
e556f11be4 Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad am: 43fd84a03c 
am: 0d0ccb0c19

Change-Id: I0abbba291721af2b66735dcbd33bbc406767536c
 2017-03-01 02:02:40 +00:00
George Burgess IV
0d0ccb0c19 Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad 
am: 43fd84a03c

Change-Id: Id2b577a021a3163d9f489235bf7f76c5f5ae527e
 2017-03-01 01:58:36 +00:00
George Burgess IV
43fd84a03c Merge "Fix memory-leak warnings from the static analyzer" 
am: 2006bfc9ad

Change-Id: I2efd6e42c72d3163505a23e8a95e45526a5ef642
 2017-03-01 01:53:27 +00:00
TreeHugger Robot
1b4cdf909f Merge "Add boolean when instant apps are available" 2017-03-01 01:49:07 +00:00
sergeyv
656117bed2 Fix premultiplied flag for hardware bitmaps 
Test: android.uirendering.cts.testclasses.HardwareBitmapTests
bug:35752428
Change-Id: I2d21822e13c007c760f2fb42370aeb9240fcb5fa
 2017-02-28 17:48:14 -08:00
Treehugger Robot
2006bfc9ad Merge "Fix memory-leak warnings from the static analyzer" 2017-03-01 01:45:52 +00:00
Peng Xu
3b17017346 Add direct sensor report NDK API 
Added libandroid mapping and implementation of the following API:

  * ASensorManager_configureDirectReport
  * ASensorManager_createSharedMemoryDirectChannel
  * ASensorManager_createHardwareBufferDirectChannel
  * ASensorManager_destroyDirectChannel
  * ASensor_getHighestDirectReportRateLevel
  * ASensor_isDirectChannelTypeSupported

Test:  cts-tradefed run cts --module CtsSensorTestCases \
      --test android.hardware.cts.SensorNativeTest

Bug: 30985702
Change-Id: Ic808cc50d1ecbc789944ef77a4b247dc0c83c28a
 2017-02-28 17:30:47 -08:00