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
John Reck
2fe57a0f9a Merge "Re-unite sources with their headers" am: e43444a00b am: 946d11d216 am: b365b0db93 
am: 68227128ac  -s ours

Change-Id: Iaf5274b7151a42617f7a19c4e98cbd8829e8b612
 2016-11-04 22:06:01 +00:00
Chad Brubaker
4389c23b35 Shift ApplicationInfo private flags 
Move FLAG_EPHEMERAL (new in O) to the gap where the old unused
FLAG_AUTPLAY was and then shift the remaining flags down.

Test: Builds
Change-Id: I9a159dd82a3eb104adc1e3985a15115e866fbda5
 2016-11-04 14:57:53 -07:00
John Reck
68227128ac Merge "Re-unite sources with their headers" am: e43444a00b am: 946d11d216 
am: b365b0db93

Change-Id: I5cbc54ea69e627a286fa1a2f855102146c3e044f
 2016-11-04 21:57:05 +00:00
Marco Nelissen
9a9e54cfb7 Merge "Use libaudioclient" 2016-11-04 21:53:57 +00:00
John Reck
b365b0db93 Merge "Re-unite sources with their headers" am: e43444a00b 
am: 946d11d216

Change-Id: Ib9fac5fff2f2ce90eebc2c6eb5208de33ea28723
 2016-11-04 21:52:43 +00:00
John Reck
946d11d216 Merge "Re-unite sources with their headers" 
am: e43444a00b

Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
 2016-11-04 21:47:34 +00:00
Chad Brubaker
cbc59b8aa6 Merge "Move ephemeral apps into the ephemeral SELinux domain" 2016-11-04 21:46:16 +00:00
Fyodor Kupolov
0995958fa5 Merge "Do not call parseInt if value is empty" 2016-11-04 21:44:17 +00:00
Treehugger Robot
e43444a00b Merge "Re-unite sources with their headers" 2016-11-04 21:41:01 +00:00
Stephen Chen
5963fd864b Merge "Implement metered tracking for NetworkStats summary queries." 2016-11-04 21:29:33 +00:00
Phil Weaver
2585033100 Add check for null manger for a11y recents action 
Bug: 31986988

Test: Ran A11y cts
Change-Id: Ia6a1e1b921d8b0008edbcf1f1a8d1d3d0eb969c6
(cherry picked from commit 3cdd6c7654)
 2016-11-04 21:12:25 +00:00
TreeHugger Robot
bdd90c8e5e Merge "Unhide findPath() API. Add JavaDoc to related features." 2016-11-04 20:50:35 +00:00
Jeff Sharkey
00455bf0fe Give easy flag to disable Direct Boot emulation. 
Direct Boot emulation is encouraged to help developers test their
apps, but it's not required.

Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest#testDirectBootEmulated
Bug: 30686636
Change-Id: I3bb2dd42c0f71e52d8b7cf8da7e50568f41aafb7
 2016-11-04 14:45:33 -06:00
John Reck
03b5d506bc Re-unite sources with their headers 
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6)
 2016-11-04 13:27:37 -07:00
Michael Kwan
ac7b7022e4 Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am: eed332bada -s ours am: 0c94d19c5d -s ours 
am: 3045e6a3c7  -s ours

Change-Id: I53c09365ec2d81aa5147c00e9ec3b931dcc15778
 2016-11-04 20:13:08 +00:00
Michael Kwan
2e91ff42d1 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: ef945b6706 -s ours am: db5045a8ba -s ours 
am: aa3e93e397  -s ours

Change-Id: Ie1235a96130bffffd3e180a52c35fcff4a04ef24
 2016-11-04 20:11:58 +00:00
Michael Kwan
3045e6a3c7 Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am: eed332bada -s ours 
am: 0c94d19c5d  -s ours

Change-Id: I767afec1a2633ac5fd5daf8b4cceeb8169a22bbe
 2016-11-04 20:06:22 +00:00
Michael Kwan
aa3e93e397 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: ef945b6706 -s ours 
am: db5045a8ba  -s ours

Change-Id: I472face3a8e08b5ddc38cd2197469535cc89fe91
 2016-11-04 20:05:25 +00:00
Michael Kwan
0c94d19c5d Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev 
am: eed332bada  -s ours

Change-Id: Ic30714c06a0865911c0e08682ccddd5d4b9ee6dc
 2016-11-04 19:58:21 +00:00
Michael Kwan
db5045a8ba DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. 
am: ef945b6706  -s ours

Change-Id: I2bcd82f58f9727a2ef51936738494b19fb6e2922
 2016-11-04 19:58:19 +00:00
TreeHugger Robot
98d4d2ba98 Merge "Filter external setting intents using IA_SETTING keyword." 2016-11-04 19:51:43 +00:00
TreeHugger Robot
eed332bada Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev 2016-11-04 19:49:25 +00:00
Sudheer Shanka
6e9dedaa74 Merge "Fix IMountService transaction ids." 2016-11-04 19:38:09 +00:00
Phil Weaver
02ea9b7587 Merge "Add check for null manger for a11y recents action" 2016-11-04 19:37:40 +00:00
Michael Kwan
3db726c43a DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: 040b4826c2 -s ours am: b22ba03e85 -s ours am: 82fe47cc44 -s ours 
am: 5822211aee  -s ours

Change-Id: I4aac99236edc24f46145cabbf805bddc321321ee
 2016-11-04 19:34:29 +00:00
John Reck
437d4e0daf Merge "Re-unite sources with their headers" 2016-11-04 19:32:06 +00:00
Jason Monk
fe62a154af Don't include the example plugin in mk 
It might accidentally get built by mm.

Test: manual
Change-Id: I1be30af36b3c392217cd5d723d19918b0adda22c
 2016-11-04 15:31:11 -04:00
Michael Kwan
5822211aee DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: 040b4826c2 -s ours am: b22ba03e85 -s ours 
am: 82fe47cc44  -s ours

Change-Id: Ib062b926972a8931ce13021a4aa8a1ba4d9d54af
 2016-11-04 19:29:03 +00:00
Michael Kwan
82fe47cc44 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: 040b4826c2 -s ours 
am: b22ba03e85  -s ours

Change-Id: I26322338d505313fe492126b892d64a329c147f5
 2016-11-04 19:21:16 +00:00
Michael Kwan
b22ba03e85 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. 
am: 040b4826c2  -s ours

Change-Id: I5b476dd054dab199135b3e8bb088d83d665e7be7
 2016-11-04 19:14:41 +00:00
Android Build Merger (Role)
e5227d443e Merge "Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 am: d4ef6421e5 am: 52df5e2c1b" 2016-11-04 19:09:41 +00:00
Greg Plesur
5729d92a85 Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 am: d4ef6421e5 
am: 52df5e2c1b

Change-Id: I228a69981d2e7ec215bdbb31d66c3a4b37e70e56
 2016-11-04 19:08:58 +00:00
TreeHugger Robot
94d0bca68f Merge "Add supports-multiwindow command to am." 2016-11-04 19:08:29 +00:00
Greg Plesur
9b3e882c1d Merge "resolve merge conflicts of c874e60 to master" 2016-11-04 19:04:39 +00:00
Paulo Casanova
c76e6b79b3 Merge "Renamed Aapt2.java to Aapt2Jni.java." 2016-11-04 18:47:24 +00:00
Sohani Rao
3bdcf16870 Update REQUEST_PEERS message with calling package 
The service enforces location permissions on the caller,
verifies the calling package is registered with the uid.

BUG: 30760540
Test: Unit tests, P2p scan to get peer list and
       establishing a Wifi Direct connection
Change-Id: Ia0eb466a370a00c0264944871ce348841a17abc3
 2016-11-04 11:39:26 -07:00
Sudheer Shanka
fc46e9b643 Move IActivityManager to aidl. 
Bug: 30977067
Test: Existing tests are passing, dump commands still working.
Change-Id: I9cf81c4d381ebce14a6c701e409cbb269f2ff1fb
 2016-11-04 10:43:25 -07:00
TreeHugger Robot
37ea9a1f02 Merge "Send BOOT_COMPLETED when updating system apps" 2016-11-04 17:01:03 +00:00
Stephen Chen
2514787897 Implement metered tracking for NetworkStats summary queries. 
Dependent on ag/1550196 where API is defined.

Bug: 31015360
Bug: 26545374
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkStatsTest.java,
other test classes.

Change-Id: I968b9e3352d7880e3fc438f12de628a2da057e0a
 2016-11-04 09:55:21 -07:00
Fan Zhang
ca60facfdc Filter external setting intents using IA_SETTING keyword. 
Also add test for CategoryKey

Bug: 32382487
Bug: 32460089
Test: make RunSettingsLibRoboTests
Change-Id: I0ed6278344a545b5fc952f5811322857382e4b60
 2016-11-04 09:39:26 -07:00
Manu Cornet
ea0257b3c3 Merge "Slightly better encapsulation for the set of recent activities" 2016-11-04 16:39:04 +00:00
Greg Plesur
d1ceaff82c resolve merge conflicts of c874e60 to master 
Change-Id: I39381c516e4a1267d06e3f7b682d1cf73eeb6f9b
 2016-11-04 12:34:30 -04:00
TreeHugger Robot
ad9d3632d1 Merge "Never use getApplicationInfo." 2016-11-04 16:12:22 +00:00
Jack Yu
59eb6ddd16 Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev am: e966a97113 
am: 250d0c402f

Change-Id: Ieb0d0742331e0ea3afed83b49e738cb3c9badbbd
 2016-11-04 16:03:09 +00:00
Jack Yu
882a695659 Added CMAS/ETWS duplicate expiration support am: f8247928a2 
am: 4461e96abb

Change-Id: I7a7e85f88e05f1dec1c83a9b41138534afc02269
 2016-11-04 16:02:14 +00:00
Greg Plesur
52df5e2c1b Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 
am: d4ef6421e5

Change-Id: I6b1b41e844c72573dd7c5de51b6e9a63b590b632
 2016-11-04 15:57:57 +00:00
Greg Plesur
c874e60002 If the current device is a watch, fix DeviceOwner/ProfileOwner logic. am: 34fb70ab88 
am: 9ee91d8d11

Change-Id: Ibf15871a6d0ca3219ebf32de89a42c9d680c427a
 2016-11-04 15:56:54 +00:00
Jack Yu
250d0c402f Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev 
am: e966a97113

Change-Id: Ia7daaa128679ec50c7b85cb03737381535507aaa
 2016-11-04 15:55:21 +00:00
Jack Yu
4461e96abb Added CMAS/ETWS duplicate expiration support 
am: f8247928a2

Change-Id: Ic8ac9c15748ae2a5f22ab08df81ed501a8365bc0
 2016-11-04 15:55:12 +00:00
Julia Reynolds
b3a04f0816 Never use getApplicationInfo. 
Always use getApplicationInfoAsUser.

Test: runtest, and install a work profile app and post a notification.

Bug: 32615127
Change-Id: I92cdf42d791d27eaff64b945be96b216e5866f6d
 2016-11-04 10:13:38 -04:00