TreeHugger Robot
a4c97ffca6
Merge changes I6c0c8730,Icbae30d2
...
* changes:
Fix Wifi Signal strength in the picker.
Create a Tron event for opening the network details page.
2017-03-01 21:02:26 +00:00
Daniel Nishi
c998b7f7ab
Merge "Add the new package stats query to wrapper."
2017-03-01 20:55:00 +00:00
TreeHugger Robot
18d62becbd
Merge "Add a process state seq counter to UidRecord."
2017-03-01 20:28:58 +00:00
TreeHugger Robot
c5e74cc2ff
Merge "Add method for plugins to reference global dependencies"
2017-03-01 19:55:25 +00:00
TreeHugger Robot
371036edde
Merge "Fix vararg build warning"
2017-03-01 19:53:25 +00:00
Ajay Nambi
8cf7c3fc9f
Merge "Add DUN to networkAttributes" am: 32d763b0ed am: 4e8cd7dca6
...
am: 5e6147faa0
Change-Id: I2ed7b482916804c783e2fa9e7c053e20e8eb59e7
2017-03-01 19:44:48 +00:00
Ajay Nambi
5e6147faa0
Merge "Add DUN to networkAttributes" am: 32d763b0ed
...
am: 4e8cd7dca6
Change-Id: I802d4cbb1ca1f04d661047c0f4cc0b650295e65c
2017-03-01 19:39:16 +00:00
Ajay Nambi
4e8cd7dca6
Merge "Add DUN to networkAttributes"
...
am: 32d763b0ed
Change-Id: I863e700b6b98bc23924d7f146e09c1c2c27f608f
2017-03-01 19:35:52 +00:00
Treehugger Robot
32d763b0ed
Merge "Add DUN to networkAttributes"
2017-03-01 19:25:39 +00:00
Sergey Vasilinets
11faa0f79a
Merge "Move graphicstests to coretests"
2017-03-01 19:20:58 +00:00
TreeHugger Robot
fc1f26f61f
Merge "Only adjust window layers from WindowLayerController"
2017-03-01 19:15:19 +00:00
TreeHugger Robot
1e121b25b5
Merge "Pinned animation: Avoid expensive defensive programming."
2017-03-01 19:11:22 +00:00
Sudheer Shanka
88c4d1ce97
Add a process state seq counter to UidRecord.
...
This seq counter is associated with the process state in UidRecord
and will be incremented whenever the uid state is going from
background to foreground or vice versa.
Bug: 27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I1183d929bc7e0b2c9912de3822eb344d2bb0dcf7
2017-03-01 10:52:19 -08:00
ashastry
195bbc6d5e
Merge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f am: 6c567af893
...
am: 70e47219b4
Change-Id: Ifc032a2dff3402909805cb122693c85fe90d0b41
2017-03-01 18:32:10 +00:00
ashastry
70e47219b4
Merge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f
...
am: 6c567af893
Change-Id: I1a891d3d8abbf506a91a0236fa7380cfa143e988
2017-03-01 18:27:52 +00:00
Jason Monk
ec34da8f6f
Add method for plugins to reference global dependencies
...
The new annotation versioning system allows plugins to share common
global interfaces that can be versioned on their own. To facilitate
this add a static method for plugins to get a hold of dependencies.
To get any dependency a plugin must @Requires it so it can be version
checked.
Test: Plugin that uses the new call.
Change-Id: I8e01260f8fbc14465502d506a7aa08212795ad9b
2017-03-01 13:26:01 -05:00
ashastry
6c567af893
Merge "Permit privileged system apps to send SMS without persisting."
...
am: 3d5504724f
Change-Id: I94cbf0ab94401149905290e395ddf71371aac849
2017-03-01 18:23:49 +00:00
ashastry
3d5504724f
Merge "Permit privileged system apps to send SMS without persisting."
2017-03-01 18:18:47 +00: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 81a28efd1b 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 81a28efd1b to stage-aosp-master
...
am: b455f0deed
Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f
2017-03-01 16:51:27 +00:00
Tyler Gunn
b455f0deed
resolve merge conflicts of 81a28efd1b 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