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
Fyodor Kupolov
0478fff36c Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev 
am: 8aa678b575

Change-Id: I703cb476b5e3cff50a266775ece86d954981cde0
 2016-12-09 20:10:59 +00:00
Fyodor Kupolov
bc8940f425 [DO NOT MERGE] Increased user switch timeout to 3s 
am: 2fe1990ba7

Change-Id: I0c33b2804fe41885c02567d3ed5208993b46086a
 2016-12-09 20:10:53 +00:00
Matthew Ng
626e0cc0aa Added supports-split-screen-multi-window command to am 
The supports-split-screen-multi-window command allows the ability to
check if the device has split screen multiwindow support in shell. The
other changes allows the code to determine if the device has support for
it as well.

This will also help CTS tests to determine if the device has split
screen before trying to run the test.

Test: manual - adb shell am supports-split-screen-multi-window
Change-Id: I3da32b5b03712a8537104469d67100ec796de9e6
 2016-12-09 12:05:59 -08:00
Fyodor Kupolov
8aa678b575 Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev 2016-12-09 19:58:22 +00:00
TreeHugger Robot
ca029c2d13 Merge "Cancels out long press on recents button when viewing home screen" 2016-12-09 19:44:41 +00:00
Hall Liu
bebbf70e2f Merge "Make use of user id in getDefaultDialerApplication" 2016-12-09 19:10:43 +00:00
Jeremy Joslin
375320edaa Make the onRequestRecommendation() method async. 
Converted the NetworkRecommendationProvider.onRequestRecommendation()
method into an async call to give implementors more flexibility.

Added unit tests for NetworkRecommendationProvider.

Test: Added NetworkRecommendationProviderTest.
BUG: 32909424
Change-Id: Iebe72f260133e9ad1946b0b75e2f69635e154ef3
 2016-12-09 09:57:32 -08:00
Jeff Sharkey
939e6cf681 Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: 2607015861" into nyc-mr2-dev-plus-aosp 
am: ca9a29f158

Change-Id: I41ab98fe1029900b25cf2454d4e1a1232f74fe60
 2016-12-09 17:48:29 +00:00
Jeff Sharkey
4a1f00d965 Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: 2607015861 
am: f997be08ba

Change-Id: I35930617f0aed984ab5ee8286396948d6a9f7831
 2016-12-09 17:48:23 +00:00
Jeff Sharkey
202a92e2b0 Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: ac7775f28e" into nyc-mr2-dev-plus-aosp 
am: c4984925bc

Change-Id: I845f965386ffba92257a70b38779e1310664f314
 2016-12-09 17:46:56 +00:00
Jeff Sharkey
481f4e788b Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: ac7775f28e 
am: 9da9a01e66

Change-Id: I0baace4fdbb236d1f423d7b407be06c6deb47bb5
 2016-12-09 17:46:47 +00:00
Jeff Sharkey
d03857bc96 Merge "Fix race condition bug related to freezing apps. am: 41d2be0f0f am: a025a0cdec" into nyc-mr2-dev-plus-aosp 
am: 143c96ce99

Change-Id: Iffe5af2a1588c3918fd074ed2936d25d1d6e40f3
 2016-12-09 17:45:28 +00:00
Jeff Sharkey
e267419823 Fix race condition bug related to freezing apps. am: 41d2be0f0f am: a025a0cdec 
am: 3179cd49ac

Change-Id: Ief3cd15afd621695e3c33a773e42e39b3df52827
 2016-12-09 17:45:19 +00:00
Jeff Sharkey
2498d0e39a Fix race condition bug related to freezing apps. am: 41d2be0f0f am: 453efdc065 
am: 1395bf02cc

Change-Id: I7d9478a626e3217cf061da22394d4c6263f1fb66
 2016-12-09 17:44:19 +00:00
Android Build Merger (Role)
ca9a29f158 Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: 2607015861" into nyc-mr2-dev-plus-aosp 2016-12-09 17:35:15 +00:00
Android Build Merger (Role)
c4984925bc Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: ac7775f28e" into nyc-mr2-dev-plus-aosp 2016-12-09 17:35:03 +00:00
Jeff Sharkey
f997be08ba Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 
am: 2607015861

Change-Id: I7c00d18135567ee7bfae0cde7c4cc960bfc4bce6
 2016-12-09 17:34:38 +00:00
Jeff Sharkey
9da9a01e66 Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 
am: ac7775f28e

Change-Id: Iff322d51519896e8795a4aaa5b85ac810cea7c95
 2016-12-09 17:34:30 +00:00
Android Build Merger (Role)
143c96ce99 Merge "Fix race condition bug related to freezing apps. am: 41d2be0f0f am: a025a0cdec" into nyc-mr2-dev-plus-aosp 2016-12-09 17:34:20 +00:00
Jeff Sharkey
1395bf02cc Fix race condition bug related to freezing apps. am: 41d2be0f0f 
am: 453efdc065

Change-Id: I879874943a30db52cfb91d5902126c275cf2ecac
 2016-12-09 17:33:42 +00:00
Jeff Sharkey
3179cd49ac Fix race condition bug related to freezing apps. am: 41d2be0f0f 
am: a025a0cdec

Change-Id: Id93b2a652b53e687b0a5201957abde1efbd1037c
 2016-12-09 17:33:38 +00:00
Jeff Sharkey
2607015861 Merge "Fix race condition bug related to freezing apps." into cw-f-dev 
am: 3350ae9c82

Change-Id: I063eeb4d5252d5559065aaa4c6e430962b8e73de
 2016-12-09 17:28:51 +00:00
Jeff Sharkey
ac7775f28e Merge "Fix race condition bug related to freezing apps." into cw-f-dev 
am: 3350ae9c82

Change-Id: Ia1f4349217b2baca92678c74d20196a3b332f008
 2016-12-09 17:28:47 +00:00
Jeff Sharkey
a025a0cdec Fix race condition bug related to freezing apps. 
am: 41d2be0f0f

Change-Id: I0b308d992725d0ffb0643157fdad27b394ff992a
 2016-12-09 17:28:45 +00:00
Jeff Sharkey
453efdc065 Fix race condition bug related to freezing apps. 
am: 41d2be0f0f

Change-Id: I012093b52efda2cdffa47143c40e2708007158f5
 2016-12-09 17:28:43 +00:00
TreeHugger Robot
666e756f2a Merge "Make buffer age work in Vulkan" 2016-12-09 17:24:19 +00:00
TreeHugger Robot
3350ae9c82 Merge "Fix race condition bug related to freezing apps." into cw-f-dev 2016-12-09 17:22:22 +00:00
Jeff Sharkey
0d0bbd01e9 Merge "Prepare to move dexopt calls to Binder." am: d7b144a5e9 am: 35cbe8ffb0 am: 41d75809aa 
am: 67c8b01f4d

Change-Id: I1a746e34856b8fa1471ccacd3a8bde1d06866679
 2016-12-09 17:08:18 +00:00
Jeff Sharkey
67c8b01f4d Merge "Prepare to move dexopt calls to Binder." am: d7b144a5e9 am: 35cbe8ffb0 
am: 41d75809aa

Change-Id: I0b87126b4b312ef8fc3c71479d6d5725e96e6acc
 2016-12-09 17:03:41 +00:00
Jeff Sharkey
41d75809aa Merge "Prepare to move dexopt calls to Binder." am: d7b144a5e9 
am: 35cbe8ffb0

Change-Id: Ice3c37568ae7185dfe028d3019abf5204aa93963
 2016-12-09 16:58:48 +00:00
Jeff Sharkey
35cbe8ffb0 Merge "Prepare to move dexopt calls to Binder." 
am: d7b144a5e9

Change-Id: I49cce8519d5b09a646609fffc6e62ecbe1a086ef
 2016-12-09 16:53:46 +00:00
phweiss
9d945d90a4 Add implementation of isNetworkLoggingEnabled to FakeSecurityController 
Fix build breakage introduced by ag/1666505.

Test: Did a local build.

Change-Id: Ie3c2d8cc89f71583b546a6085c3f991e0affaa61
 2016-12-09 17:49:31 +01:00
Jeff Sharkey
d7b144a5e9 Merge "Prepare to move dexopt calls to Binder." 2016-12-09 16:42:25 +00:00
Philipp Weiß
9498f5a81b Merge "Add network logging icon to Quicksettings when enabled" 2016-12-09 16:31:41 +00:00
Jeff Sharkey
41d2be0f0f Fix race condition bug related to freezing apps. 
Consider the following situation:

1. Package is frozen.
2. We try forking the app while frozen, causing a ProcessRecord with
PID 0 to be recorded in mProcessNames. As a result of the failed
fork, removeProcessLocked() tears down that ProcessRecord, but a
special case records it into mRemovedProcesses.
3. Package is unfrozen.
4. We try forking the app, and this time it proceeds normally now
that we're unfrozen.  The new valid ProcessRecord is recorded in
mProcessNames.
5. activityIdleInternalLocked() triggers a clean-up pass of
mRemovedProcesses.  trimApplications() ends up cleaning up the
stale reference from (2) above *by hash key* and not *by reference*,
which causes us to remove the new valid ProcessRecord.  This results
in the valid ProcessRecord in (4) becoming an orphaned PID, which
starts a chain reaction of havoc that ensues.

This issue is fixed by checking the expected ProcessRecord by value
before actually removing it, thus preventing orphaned PIDs.

Test: builds, boots, over 600 installs without orphaned PIDs
Bug: 28395549
Change-Id: I5ea1b31c3fd374ea7f5cc40ff35bb9195d9f3e2b
 2016-12-09 09:07:16 -07:00
Jerome Gaillard
404091b0a9 Implement NativeInterpolatorFactoryHelper_Delegate method 
The method createPathInterpolator was add in Commit 9e9eeeeb78.

Test: Run layoutlib tests
Change-Id: Id17e05762bf7e5a994aa8066f11805b58a00f5ce
 2016-12-09 15:58:40 +00:00
Greg Daniel
cd55852fcd Make buffer age work in Vulkan 
Test: manual testing in skiavk mode

Change-Id: I5b9d8af7d9cecf2f022ef104ec33a5b7477e9e0c
 2016-12-09 15:45:15 +00:00
Julia Reynolds
e03b8124d0 Merge "Accept adjustments from notification assistant." 2016-12-09 15:23:08 +00:00
Paul Duffin
f8145c9f3f Merge "Move android.test classes from core/java to legacy-test/src" am: 2761ed124a am: 28b617bdea am: 7e28011fea 
am: 0e4fc20971  -s ours

Change-Id: Ia1089230236d2ae31e3b8a96bcc20780a09dc949
 2016-12-09 15:20:16 +00:00
Paul Duffin
0e4fc20971 Merge "Move android.test classes from core/java to legacy-test/src" am: 2761ed124a am: 28b617bdea 
am: 7e28011fea

Change-Id: I075483114837003014a68614ce9f55a5d199ec85
 2016-12-09 15:15:06 +00:00
Paul Duffin
7e28011fea Merge "Move android.test classes from core/java to legacy-test/src" am: 2761ed124a 
am: 28b617bdea

Change-Id: I83a6ce6c329e7eb18ee90689682c30d4a73d7f8e
 2016-12-09 15:10:10 +00:00
Paul Duffin
28b617bdea Merge "Move android.test classes from core/java to legacy-test/src" 
am: 2761ed124a

Change-Id: I0009b93ff096456d7f5fd5f83e71fd4b9bff31db
 2016-12-09 15:05:06 +00:00
Neil Fuller
5ba69e46ed Track BufferIterator changes in libcore 
Addition of a new method pos().

Bug: 31008728
Test: make
Change-Id: Id5fcb13104a8580ffaa7d4f8d3c473fe14ac5ccd
 2016-12-09 14:59:26 +00:00
Paul Duffin
2761ed124a Merge "Move android.test classes from core/java to legacy-test/src" 2016-12-09 14:56:37 +00:00
Jerome Gaillard
41bcee32fe Fix path to JUnit jar for IDEA module in layoutlib 
Necessary after change in makefiles from AOSP commits 21cf84f8b3
and 4a064d2010.

Test: Run layoutlib tests from IDEA
Change-Id: I7359c5f41726972c45ff99f34ed5ecb036946034
 2016-12-09 14:55:14 +00:00
Paul Duffin
d89d07a431 Merge "Move android.test classes from core/java to legacy-test/src" 2016-12-09 13:06:11 +00:00
Bill Yi
ec851bc0f9 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1e40ddc47a -s ours 
am: b28dedff56  -s ours

Change-Id: I42fa2adcd8731649f412d5044e94bf4b0c55299e
 2016-12-09 12:18:48 +00:00
Bill Yi
201f5a7ff7 Import translations. DO NOT MERGE am: 77deddca61 -s ours 
am: 83774c3a0a  -s ours

Change-Id: I1ca982cec0cb8c9c5ae21c899c31e6000a05e1ca
 2016-12-09 12:17:59 +00:00
Bill Yi
b28dedff56 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 1e40ddc47a  -s ours

Change-Id: I5af01f895553bfbf3eeb6de15d3a53e42c33f351
 2016-12-09 12:13:29 +00:00
Bill Yi
83774c3a0a Import translations. DO NOT MERGE 
am: 77deddca61  -s ours

Change-Id: Ia83dfc15cb69555451db31abf5c164357db87e3d
 2016-12-09 12:13:26 +00:00