Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
388,342 Commits 3 Branches 0 Tags
002f63d0ffb25d261cccee48690d3c945924eb43
Commit Graph

388342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doris Ling
002f63d0ff Merge "Change to get network history from NetworkStatsManager." 2018-10-08 17:24:37 +00:00
Kevin Hufnagle
1a14cfb64d Merge "docs: Added callouts related to obsolete contacts data fields." 2018-10-08 16:34:29 +00:00
TreeHugger Robot
6d659e8ceb Merge "libandroidfw: move ConfigDescription from aapt2 to libandroidfw" 2018-10-08 15:41:13 +00:00
Dimitry Ivanov
a60c94aab9 Merge "Respect extractNativeLibs in natively bridged environments" am: 61b9b6c9eb am: a00f278956 
am: 7c154d103c

Change-Id: Ibe46c36aa545703781fbc5f56eb5e57f46ece543
 2018-10-08 08:33:04 -07:00
Philip P. Moltmann
be6d86810f Merge "Print document generation: Schedule new layout if current command is canceling" 2018-10-08 15:22:28 +00:00
Dimitry Ivanov
7c154d103c Merge "Respect extractNativeLibs in natively bridged environments" am: 61b9b6c9eb 
am: a00f278956

Change-Id: Ia790b6fed75624cec36577cfc68d12e5a029d500
 2018-10-08 08:19:24 -07:00
Makoto Onuki
c201a89fe9 Merge "Fix getContentProviderImpl() permission issue" 2018-10-08 15:19:23 +00:00
Dimitry Ivanov
a00f278956 Merge "Respect extractNativeLibs in natively bridged environments" 
am: 61b9b6c9eb

Change-Id: I6072e16c1cdf9543d38ec8763931abf095bd2313
 2018-10-08 08:05:41 -07:00
Dimitry Ivanov
61b9b6c9eb Merge "Respect extractNativeLibs in natively bridged environments" 2018-10-08 14:50:08 +00:00
Kevin Hufnagle
94b9e05f76 docs: Added callouts related to obsolete contacts data fields. 
Also added callouts for fields that no longer sort results based on
contacts frequency.

Test: make ds-docs -j32

Bug: 116422556
Change-Id: Iddcd0b41b6ad991423a5ced78522a9ab2ad831a1
Original-Change-Id: I738e08bd4686e30b875fa37123ecebb4a5e179d3
 2018-10-08 07:45:08 -07:00
Mårten Kongstad
24c9aa6541 libandroidfw: move ConfigDescription from aapt2 to libandroidfw 
This is to allow idmap2 to access ConfigDescription.

Test: libandroidfw_tests
Test: aapt2_tests
Change-Id: I54210bbbd8dad5903cb7100807df977efa394ad5
 2018-10-08 06:50:22 -07:00
Olivier Gaillard
e2693cb9ca Perf test to measure various mechanisms to track CPU. 
Change-Id: I84cac933c62b03421632a7321a40526d9d3884cf
Test: this is a test
 2018-10-08 13:52:46 +01:00
Eddie Hung
a4b1fe6547 Merge "Fix UsbDeviceManager null object reference" am: 9b1db24f6e am: ec5dd5f1dd 
am: e419713dc8

Change-Id: Ie1c573d76c863684df360735d94796e7f0336cb6
 2018-10-08 01:36:48 -07:00
Eddie Hung
e419713dc8 Merge "Fix UsbDeviceManager null object reference" am: 9b1db24f6e 
am: ec5dd5f1dd

Change-Id: Ib95d75c80af12db8bb617df5ce0bcc0cd6c6c028
 2018-10-08 01:24:08 -07:00
Eddie Hung
ec5dd5f1dd Merge "Fix UsbDeviceManager null object reference" 
am: 9b1db24f6e

Change-Id: I70cb3a014eb19ee6214f4590d50e705ab4b9130f
 2018-10-08 01:10:46 -07:00
Treehugger Robot
9b1db24f6e Merge "Fix UsbDeviceManager null object reference" 2018-10-08 07:44:48 +00:00
SongFerng Wang
e42a94ea3e Merge "add four new carrier configs for supplementary service precautions." 2018-10-08 06:28:43 +00:00
TreeHugger Robot
a72448e809 Merge "Move last focused stack from global to per-display" 2018-10-08 02:53:35 +00:00
TreeHugger Robot
e1a83fef63 Merge "Import translations. DO NOT MERGE" 2018-10-08 01:49:12 +00:00
TreeHugger Robot
a7315ae510 Merge "Import translations. DO NOT MERGE" 2018-10-08 00:19:19 +00:00
TreeHugger Robot
b30da3aad9 Merge "Import translations. DO NOT MERGE" 2018-10-08 00:18:12 +00:00
Bill Yi
44f7570f84 Import translations. DO NOT MERGE 
Change-Id: Idb9e6c118b173e74022e6496084de70b1e452124
Auto-generated-cl: translation import
 2018-10-07 11:29:08 -07:00
TreeHugger Robot
97267fe833 Merge "Import translations. DO NOT MERGE" 2018-10-07 17:53:25 +00:00
Bill Yi
9811f7f98f Import translations. DO NOT MERGE 
Change-Id: I6dc612c6234521fc88f3776c01af3b24ad235768
Auto-generated-cl: translation import
 2018-10-07 09:31:24 -07:00
Bill Yi
9f99d6951b Import translations. DO NOT MERGE 
Change-Id: I388309fd47fb9307304a5d24e9127a7d6136afe5
Auto-generated-cl: translation import
 2018-10-07 09:24:31 -07:00
Bill Yi
5cedc841f7 Import translations. DO NOT MERGE 
Change-Id: I2c2d6ff56abb9e2cc17bd6d9c7bd6ab0e9b6f4cf
Auto-generated-cl: translation import
 2018-10-07 06:04:39 -07:00
Bill Yi
a5c6d1a68d Import translations. DO NOT MERGE 
Change-Id: Ibfaca8c7e07715d1f2b4e9915258acb5f8f47681
Auto-generated-cl: translation import
 2018-10-06 19:57:45 -07:00
TreeHugger Robot
10efed0b49 Merge "Remove SMS access for apps other than current SMS handler" 2018-10-06 20:14:06 +00:00
TreeHugger Robot
ce10f9b15f Merge "Instantiate InputMethodManager for each display" 2018-10-06 17:19:58 +00:00
Wale Ogunwale
2f6c71d781 Merge "Moved startHomeActivity methods from AMS to ATMS (19/n)" 2018-10-06 13:45:13 +00:00
Wale Ogunwale
214f348ebb Moved startHomeActivity methods from AMS to ATMS (19/n) 
Bug: 80414790
Test: Existing tests pass.
Change-Id: Ie3354304ea800777bd9ca7a83885b379776704e2
 2018-10-05 23:32:49 -07:00
TreeHugger Robot
fc3f6546b0 Merge "Check for race condition between onAuthenticated and taskStackChanged" 2018-10-06 05:07:25 +00:00
Kevin Chyn
c79856b460 Check for race condition between onAuthenticated and taskStackChanged 
Bug: 111461540

Test: no more logs like the ones below

Change-Id: I784ecc71df1028bac8e0203156f79157f0509636
FingerprintService: onAuthenticated(owner=com.android.settings, id=-1049244503
FingerprintService: Stopping background authentication, top: com.example.android.biometric currentClient: com.android.settings
FingerprintService: client com.android.settings is no longer authenticating
FingerprintService: Done with client: com.android.settings
FingerprintService: handleError(client=null, error = 5)
 2018-10-05 20:41:50 -07:00
Sooraj Sasindran
e9bcb328bd Merge "Rename ANAS to ANS" 2018-10-06 03:41:26 +00:00
TreeHugger Robot
3121ea3039 Merge "Get correct hasEnrolled for work profiles" 2018-10-06 02:50:45 +00:00
Kevin Chyn
75dbb83fc2 Get correct hasEnrolled for work profiles 
The check within BiometricService is done from system server process
so we need to pass in the actual userId.

Bug: 111461540

Test: With normal profile and FP enrolled, with work profile and no
      FP enrolled, launching BiometricPromptDemo for work profile
      and attempting to start authentication shows "none enrolled" message.

Change-Id: I45a1136d2b33bc7c594a3401e2a087103fb839f3
 2018-10-05 19:17:28 -07:00
Hall Liu
50600fcc61 Merge "Wire up the stopRtt API" am: 2d82493ded am: c7d6900e49 
am: 41535c78be

Change-Id: Ia5e8888fbdff213167f031d221f301d5c4659cfc
 2018-10-05 18:32:14 -07:00
Hall Liu
41535c78be Merge "Wire up the stopRtt API" am: 2d82493ded 
am: c7d6900e49

Change-Id: I76eb7a9ac0c89b962241e4787a6306ad65e37792
 2018-10-05 18:19:54 -07:00
TreeHugger Robot
0ccb5a9705 Merge "pull procstats package process stats section" 2018-10-06 01:19:25 +00:00
Hall Liu
c7d6900e49 Merge "Wire up the stopRtt API" 
am: 2d82493ded

Change-Id: I720ec95129c7da6b0fbd802522f6b85f54de2f7b
 2018-10-05 18:08:28 -07:00
Pengquan Meng
80e0e4e54d [automerger skipped] Merge "Fix incorrect API comments of getSubId()" am: 66a0899785 am: 5a75425936 
am: 4ddb43ddf1  -s ours

Change-Id: I8409778d15e05840f61a47cb6c6cfae8c61e8c9a
 2018-10-05 18:00:52 -07:00
Hall Liu
2d82493ded Merge "Wire up the stopRtt API" 2018-10-06 00:49:14 +00:00
Pengquan Meng
4ddb43ddf1 Merge "Fix incorrect API comments of getSubId()" am: 66a0899785 
am: 5a75425936

Change-Id: I85a566c0eb25c73237c31b1f89975ed898a4f829
 2018-10-05 17:46:38 -07:00
Pengquan Meng
5a75425936 Merge "Fix incorrect API comments of getSubId()" 
am: 66a0899785

Change-Id: Ia4f100021e33aac65208eb2ef4c15ca0f1b7d5c4
 2018-10-05 17:35:11 -07:00
Pengquan Meng
66a0899785 Merge "Fix incorrect API comments of getSubId()" 2018-10-06 00:13:01 +00:00
Eugene Susla
9351985f7a Remove SMS access for apps other than current SMS handler 
Bug: 110098858
Test: atest android.telephony.cts.SmsManagerTest#testContentProviderAccessRestrictions
Change-Id: I9da992565b04ca5fa2656801fd2cfe4b196ef9b4
 2018-10-05 16:51:13 -07:00
Artem Iglikov
c474bfd0cd Fix PowerManagerService handling of work chains. 
When a wakelock with specific set of flags is requested
PowerManagerService crashes with NPE because
applyWakeLockFlagsOnAcquireLocked does not handle work chains and
requires UID set directly on the work source instead of the work chain.

This fixes the behavior by handling the work chains as well as
introducing additional emptiness checks.

There may be multiple work chains in a work source, and only the first
one is used. I don't know the details of this method, but it looks like
it's a reasonable decision.

Bug: 113868145
Test: atest FrameworksCoreTests:PowerManagerTest

Change-Id: Idbfa1d0cd32ddc021caf6443138688d3f8b7c946
 2018-10-05 16:40:48 -07:00
TreeHugger Robot
a5f160fd6e Merge "Show padlock on AOD" 2018-10-05 23:29:45 +00:00
Shuo Qian
bc905712fc Merge "Add Parcelable EmergencyNumber and APIs" am: 379ca95c89 am: e414f5ed16 
am: ffdf4d26ec

Change-Id: I4106b0a3e519c2a89db29196edfe05a6a515125d
 2018-10-05 16:22:13 -07:00
Chenjie Yu
b52779e710 pull procstats package process stats section 
Test: cts
BUG: b/113075820
Change-Id: Iad37427227181ff41b3630a3c907c7bb7f3efa2b
 2018-10-05 23:21:51 +00:00