drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,599 Commits 1 Branch 0 Tags
Commit Graph

176599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olawale Ogunwale
6091dcbb80 Merge "[ActivityManager] Improve multi-thread access the same provider" 2015-04-01 14:58:21 +00: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
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
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
568039dda6 Import translations. DO NOT MERGE 
Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import
 2015-04-01 02:46:18 -07: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
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
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
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
Alex Klyubin
562c6a71f9 Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH" 2015-04-01 00:47:01 +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
Alex Klyubin
b7a34e4955 Merge "Add license banner to recently added AndroidKeyStore files." 2015-03-31 23:52:46 +00:00
Alex Klyubin
cc21bb3a56 Add license banner to recently added AndroidKeyStore files. 
Bug: 18088752
Change-Id: I027f9530a02cca081aae8eb94833d2fdcb678e9a
 2015-03-31 16:50:37 -07:00
Alex Klyubin
19e79e12d8 Merge "Add SecretKeyFactory backed by AndroidKeyStore." 2015-03-31 23:32:41 +00:00
Rich Slogar
19f75fd71e docs: systrace update 
Change-Id: I693f6b3eef32a412dd1764d39706dcebef9e000c
 2015-03-31 16:14:51 -07:00
Alex Klyubin
acc835f385 Add SecretKeyFactory backed by AndroidKeyStore. 
This factory provides a way to obtain information about a SecretKey
backed by AndroidKeyStore. The information is provided in a form of an
instance of KeyStoreKeySpec class.

EXAMPLE

SecretKeyFactory factory = SecretKeyFactory.getInstance(
        key.getAlgorithm(), "AndroidKeyStore");
KeyStoreKeySpec keySpec =
    factory.getKeySpec(key, KeyStoreKeySpec.class);

Bug: 18088752
Change-Id: I26c9dd544f80230fe7039501eeb471eaf875452b
 2015-03-31 15:29:48 -07:00
Craig Mautner
d720dedb03 Merge "Clear the previous states before setting the new app visibility" 2015-03-31 22:24:15 +00:00
Yang Ni
63dde9c88d Merge "Fix value size data type in closure creation." 2015-03-31 21:32:24 +00:00
Alex Klyubin
d684ebd3a6 am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 
* commit '0bd10c21ff1bb00f178738301ad4663c7cebd28f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
 2015-03-31 21:20:51 +00:00
Alex Klyubin
0bd10c21ff am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 
* commit '5960c3d56614830439718e93968e0c7d2727262f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
 2015-03-31 21:13:49 +00:00
Alex Klyubin
5960c3d566 Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 2015-03-31 21:00:17 +00:00
Alex Klyubin
b406f24291 Add unauthenticated AES ciphers backed by AndroidKeyStore. 
This adds the following AES transformations:
* AES/ECB/NoPadding
* AES/ECB/PKCS7Padding
* AES/CBC/NoPadding
* AES/CBC/PKCS7Padding
* AES/CTR/NoPadding

Bug: 18088752
Change-Id: I3e4702e59868f8f2225c31b1c159d20008b9999d
 2015-03-31 13:59:07 -07:00
Kenny Root
28c51bacbd am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit 'a3a52a96543bd3874e23d90f91b5f4197eab98e5':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 19:22:17 +00:00
Kenny Root
a3a52a9654 am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '4999b175e9c25b7e860f9c2f3b6566d08c8e50e7':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 19:14:48 +00:00
Kenny Root
4999b175e9 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 19:10:50 +00:00
Chad Brubaker
543189eb71 am 826d6357: am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '826d63572be4b23ad2f70f3004d520d54ef4dc01':
  Include operation handle in OperationResult
 2015-03-31 18:10:02 +00:00
Chad Brubaker
826d63572b am 5491ea9e: Merge "Include operation handle in OperationResult" 
* commit '5491ea9e5bc6ce8eb0dc2e91e46608f6aa3e7dfc':
  Include operation handle in OperationResult
 2015-03-31 18:03:21 +00:00
Chad Brubaker
5491ea9e5b Merge "Include operation handle in OperationResult" 2015-03-31 17:49:16 +00:00
Svetoslav
becacfb843 am ffd24a58: am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'ffd24a58c89bcb502e8d6299b4368353b08a45be':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:54:36 +00:00
Kenny Root
6a2d2b9f2b am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '5fdb2ea76a8e0ffe8786a1e92ce565f7380384db':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 16:54:32 +00:00
Svetoslav
ffd24a58c8 am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '13d8e41d3a866df0899a89c44c6afc4e2eb31bdc':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:46:44 +00:00
Kenny Root
5fdb2ea76a am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit 'a7645df5973cfb26aecabe093409e33eb745df17':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
 2015-03-31 16:46:39 +00:00
Svetoslav
13d8e41d3a am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'c6be7545b4106b9ba586e365f2d2ab911cafea93':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:41:00 +00:00
Kenny Root
a7645df597 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 16:40:15 +00:00
Svetoslav
c6be7545b4 am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:33:21 +00:00
Olawale Ogunwale
6abcec1d76 am df736de8: am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 
* commit 'df736de8d8165b1aff675d00581ccdf94a7547aa':
  [ActivityManager] Fix index out of bounds when updating next pss time.
 2015-03-31 16:27:48 +00:00
Olawale Ogunwale
df736de8d8 am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 
* commit 'd052a3d37beffff3735716340745ec7c83efc23d':
  [ActivityManager] Fix index out of bounds when updating next pss time.
 2015-03-31 16:21:03 +00:00
Kenny Root
9a7c1a3549 Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE 
This reverts commit 693ea60e9e3d2ef476e4f45caac234360d90bdb9.

Bug: 19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
 2015-03-31 09:15:40 -07:00