186924 Commits

Author SHA1 Message Date
Olawale Ogunwale
bcfa7cb250 am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit '259a649a935ca2ed63419a079211b0ac35f67496':
  [ActivityManager] Improve multi-thread access the same provider
2015-04-01 15:28:16 +00:00
Wale Ogunwale
ee006da858 Converted more log points in AMS to use ActivityManagerDebugConfig.
Change-Id: I59e777de30e2e9a3c7d086dc634129cd19135fab
2015-04-01 08:28:14 -07:00
Olawale Ogunwale
259a649a93 am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit '6091dcbb80d3b1b885b6e02386ccb3139e5e43ae':
  [ActivityManager] Improve multi-thread access the same provider
2015-04-01 15:18:45 +00:00
Olawale Ogunwale
6091dcbb80 Merge "[ActivityManager] Improve multi-thread access the same provider" 2015-04-01 14:58:21 +00:00
Geoff Mendal
066be66d60 Merge "Import translations. DO NOT MERGE" 2015-04-01 12:35:05 +00:00
Geoff Mendal
e201fa8066 Merge "Import translations. DO NOT MERGE" 2015-04-01 12:22:13 +00:00
Geoff Mendal
ad1b35aa77 Import translations. DO NOT MERGE
Change-Id: I3626ff76ad51e22c35904023ae530f0f2b18b3f1
Auto-generated-cl: translation import
2015-04-01 05:09:43 -07:00
riddle_hsu
db46d6b074 [ActivityManager] Reduce report wrong anr activity
Symptom:
Report ANR on wrong activity.

Reproduce steps:
 (All launchMode, taskAffinity are default and
  without additional intent flag)
 Case 1:
  1.Launch activity A from launcher.
  2.Activity A starts B activity.
  3.Press home key.
  4.Launch activity A from launcher (B is top).
  5.Press back key twice to finish B and A,
    A sleep 10s in onResume.
  6.ANR will report on launcher.

 Case 2:
  1.Launch activity A from launcher.
  2.Press home key.
  3.Kill process of A.
  4.Launch activity A from launcher.
  5.A sleep 10s in onResume, press back key immediately.
  6.ANR will report on launcher.

Possible root cause:
Focused activity will not be updated every time when activity
resumed. (the condition to call setFocusedActivityLocked)

Case 1:
Launcher was stopped and not waitingVisible due to launcher
is not the previous one, then getWaitingHistoryRecordLocked
has no chance to correct the real ANR activity.

Case 2:
Due to process of next activity is died, bring existed
task will not set mResumedActivity (it will be set when its
process is started), so when assigning waitingVisible from
processStoppingActivitiesLocked, the return value of
allResumedActivitiesVisible will be true even there is no
mResumedActivity. That results set waitingVisible to false
to previous activity (e.g. launcher), then also cannot
correct ANR target as case 1.

Change-Id: I0b24f46a8fab266382ebc6e2ed84ebeca9358768
2015-04-01 18:58:07 +08:00
Geoff Mendal
670973a834 am 47121c5e: (-s ours) am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '47121c5e1e42e68345b6b994091904549509cfe4':
  Import translations. DO NOT MERGE
2015-04-01 10:28:45 +00:00
Geoff Mendal
3a4f024ae0 Import translations. DO NOT MERGE
Change-Id: I72a0fc2dbbf1028462653ee5b97094508c4064c6
Auto-generated-cl: translation import
2015-04-01 03:23:27 -07:00
Geoff Mendal
47121c5e1e am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '22c930457a3f5848ec699fc79e38c4c0d2e5963a':
  Import translations. DO NOT MERGE
2015-04-01 10:18:24 +00:00
Geoff Mendal
31dd2c688b am 8dae38f2: (-s ours) Import translations. DO NOT MERGE
* commit '8dae38f2e51f2f1193523ac87c78192a302668f8':
  Import translations. DO NOT MERGE
2015-04-01 10:12:31 +00:00
Geoff Mendal
22c930457a am 568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '568039dda61f9245cd37901c5c2284e6cc79bda4':
  Import translations. DO NOT MERGE
2015-04-01 10:07:56 +00:00
Geoff Mendal
8dae38f2e5 Import translations. DO NOT MERGE
Change-Id: I88cb981996fd8f533071e0819c314f63d7036cb1
Auto-generated-cl: translation import
2015-04-01 02:55:00 -07:00
Geoff Mendal
0b1f41230a Import translations. DO NOT MERGE
Change-Id: I02c4b9d0fcb21c0224590503fa8720805db3d2fa
Auto-generated-cl: translation import
2015-04-01 02:49:53 -07:00
Geoff Mendal
568039dda6 Import translations. DO NOT MERGE
Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import
2015-04-01 02:46:18 -07:00
Lorenzo Colitti
a12bde3567 Deal with null characters in string options.
This currently truncates all strings at the first NULL character,
except for vendorInfo, which is an opaque string.

Bug: 19985674
Change-Id: Ie53b2c55eb8a5204d7b2c7e2d8587743d923647a
2015-04-01 17:53:14 +09:00
Craig Mautner
aa2609aae7 Merge "Revert "Add lockTaskOnLaunch attribute."" 2015-04-01 07:48:08 +00:00
Craig Mautner
6372ba20e9 Merge "Revert "Fix build."" 2015-04-01 07:47:51 +00:00
riddle_hsu
57307b21cb [ActivityManager] Improve multi-thread access the same provider
Application may use many threads to load data from provider.
If the target provider needs to start process, each access
will occupy one binder thread of system server until the
provider process started and published.

Sometimes application uses more than 16 threads to access
the same provider, and the provider process needs a little
long time to start, then all binder threads of system server
are waiting. But when the provider is ready, it is unable to
publish to notify those waiting threads because no availabe
binder thread to use. And device will become almost hang.

Improvement:
If there is already a thread acquiring provider, let other threads
(which try to acquire the same provider) wait the result of the
first one. That reduces IPC to save binder thread of system server.

Remove calling removeContentProvider in installProvider because
we have ensured only get one provider holder for the same provider,
the original race that gets a new useless holder will not happen.

Change-Id: I521f2603db8ced56912f5dc54342a70451e68381
2015-04-01 15:06:18 +08:00
Craig Mautner
6cd6cec2ad Revert "Add lockTaskOnLaunch attribute."
This reverts commit 0fb1cb56abf708291c09c783463408c7074ae9a7.
2015-04-01 00:02:12 -07:00
Craig Mautner
85ba750079 Revert "Fix build."
This reverts commit 37ac0b530a6b290f6fbb677e730daa3506856acb.
2015-04-01 00:02:06 -07:00
Craig Mautner
dc29a86e48 Merge "Fix build." 2015-04-01 06:59:50 +00:00
Craig Mautner
37ac0b530a Fix build.
Change-Id: I5d47c9be7867f0f336a12974b90b39d673c8e735
2015-03-31 23:58:55 -07:00
Alex Klyubin
52886ca77d A way to obtain KeyStore operation handle from crypto primitives.
This adds AndroidKeyStore.getKeyStoreOperationHandle method which can
be used to obtain the KeyStore operation handle corresponding to the
provided JCA cryto primitive (provided it's backed by
AndroidKeyStore).

Bug: 18088752
Change-Id: Iaa3b6f9b2281b2ec2de8fd5946d353dc7fdb3d2d
2015-03-31 21:19:26 -07:00
Andrew Solovay
d0609d1cb4 docs: Fixed formatting in android:documentLaunchMode syntax section
Also fixed the line breaks in android:configChanges so the syntax
code box doesn't need a horizontal scroll bar.

See first comment for doc stage location.

bug: 19935160
Change-Id: I1ec34473e743a9f0c921f771cfb47129c47f9014
2015-03-31 21:02:44 -07:00
Andrew Solovay
b2255d4f10 docs: Fixed a typo.
See first comment for doc stage location.

bug: 19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0
2015-03-31 20:13:57 -07:00
Alex Klyubin
c8e557470f Hook in user authenticators and their exceptions.
Bug: 18088752
Change-Id: I2835dbe51d09587a3081597c6aaf536aa1427e24
2015-03-31 19:50:13 -07:00
Alex Klyubin
55d53ac837 am 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
* commit '36865896072ee78cae1e987f29340d35a1526f44':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
2015-04-01 02:20:55 +00:00
Alex Klyubin
1dd2e88ed4 am f0c71ceb: am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
* commit 'f0c71ceb8a9bbd9bbd793e599d08e29d77a509f8':
  Add license banner to recently added AndroidKeyStore files.
2015-04-01 02:20:48 +00:00
Alex Klyubin
e0e8aa1ebc am c230e190: am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit 'c230e1908f6307913e5af644a6594cc0f9f3fb93':
  Add SecretKeyFactory backed by AndroidKeyStore.
2015-04-01 02:20:40 +00:00
Craig Mautner
787bacd35a am a54f2b16: am 8bed4843: am d720dedb: Merge "Clear the previous states before setting the new app visibility"
* commit 'a54f2b164a4e162069709fd1f3b3fb7ff08dcd47':
  Clear the previous states before setting the new app visibility
2015-04-01 02:20:31 +00:00
Yang Ni
249e6c8cd8 am 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."
* commit '02dff422a7734764e3ce00179f62ba115f2081a5':
  Fix value size data type in closure creation.
2015-04-01 02:19:41 +00:00
Alex Klyubin
3686589607 am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
* commit 'b48ebf4855ec9e158ee88d05618928ff8f5943d1':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
2015-04-01 02:05:45 +00:00
Alex Klyubin
f0c71ceb8a am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
* commit '01e53ef1fc5e3004bfb627d252565305df9a4056':
  Add license banner to recently added AndroidKeyStore files.
2015-04-01 02:05:41 +00:00
Alex Klyubin
c230e1908f am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit '9c0f257f0080aba0743f34fb6202215fca295146':
  Add SecretKeyFactory backed by AndroidKeyStore.
2015-04-01 02:05:37 +00:00
Craig Mautner
a54f2b164a am 8bed4843: am d720dedb: Merge "Clear the previous states before setting the new app visibility"
* commit '8bed4843dc7f93a30e607dbb11012a04ca5dcf95':
  Clear the previous states before setting the new app visibility
2015-04-01 02:05:33 +00:00
Yang Ni
02dff422a7 am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."
* commit '5db6f1fafa4990b2d583dcb407be361edc02019d':
  Fix value size data type in closure creation.
2015-04-01 02:05:27 +00:00
Andy Hung
c09ccc5631 Merge "Fix SoundPool track recycling for fast tracks" 2015-04-01 01:42:00 +00:00
Craig Mautner
e1d6333341 Merge "Add lockTaskOnLaunch attribute." 2015-04-01 01:40:57 +00:00
Alex Klyubin
b48ebf4855 am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
* commit '562c6a71f98e921fe8def18991b2a26f153c683d':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
2015-04-01 01:27:54 +00:00
Alex Klyubin
01e53ef1fc am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
* commit 'b7a34e4955beae2cee81a27e7c240316078bbf2f':
  Add license banner to recently added AndroidKeyStore files.
2015-04-01 01:27:48 +00:00
Alex Klyubin
9c0f257f00 am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit '19e79e12d82fa473f2f7beec337de11a0c3b3a03':
  Add SecretKeyFactory backed by AndroidKeyStore.
2015-04-01 01:27:41 +00:00
Craig Mautner
8bed4843dc am d720dedb: Merge "Clear the previous states before setting the new app visibility"
* commit 'd720dedb03dfc937361e7e722171f8a1b9d74cf1':
  Clear the previous states before setting the new app visibility
2015-04-01 01:27:34 +00:00
Yang Ni
5db6f1fafa am 63dde9c8: Merge "Fix value size data type in closure creation."
* commit '63dde9c88d780fc16a4f2471e405b4f5dc35823c':
  Fix value size data type in closure creation.
2015-04-01 01:27:27 +00:00
Craig Mautner
0fb1cb56ab Add lockTaskOnLaunch attribute.
The new AndroidManifest activity attribute, lockTaskOnLaunch attribute
is a boolean that puts the system in lockTask mode when true and if
the activity specified is the root of a privileged task.

This bug also fixes lockTask mode for root activities that finish
themselves. Previously finish was not allowed even if there were
activities left in the task that were still valid.

A NullPointerException for lock task toasts has also been fixed.

Fixes bug 19995702.

Change-Id: Iba6976b1a0cc5a22eb526db66d2e9af66445541f
2015-03-31 18:15:05 -07:00
Alex Klyubin
562c6a71f9 Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH" 2015-04-01 00:47:01 +00:00
Qiwen Zhao
9a1ada6df6 Merge "Data usage API: any uid is accessible to system apps running in any user" 2015-04-01 00:40:05 +00:00
Alex Klyubin
c0eb55ccc7 UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
This is to follow naming from keymaster_defs.h

Bug: 18088752
Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59
2015-03-31 17:16:31 -07:00
Santos Cordon
bb251057fb Merge "Do not hide any call log entries when they are added." 2015-04-01 00:01:16 +00:00