OSDN Git Service

android-x86/frameworks-base.git
9 years agoFixed NPE when trying to animate a windows whose display is gone.
Wale Ogunwale [Wed, 1 Apr 2015 18:23:15 +0000 (11:23 -0700)]
Fixed NPE when trying to animate a windows whose display is gone.

In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Also corrected some method names/scopes I ran across while debugging.

Bug: 19972099
Change-Id: Ib0ae7ede6c506f833bbdd66723b88e7504a61907

9 years agofixed build breakage due to bad merge. again...
Wale Ogunwale [Wed, 1 Apr 2015 19:32:32 +0000 (12:32 -0700)]
fixed build breakage due to bad merge. again...

Change-Id: I601bade61837e4408be083530d10c48c0595b38c

9 years agoam 6f09c95c: am 3e3af524: am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 19:28:03 +0000 (19:28 +0000)]
am 6f09c95c: am 3e3af524: am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.

* commit '6f09c95c51d77c4f2a2d8d2b2271ec4d8efbea56':
  docs: Fixed a typo.

9 years agofixed build breakage due to bad merge.
Wale Ogunwale [Wed, 1 Apr 2015 19:22:16 +0000 (12:22 -0700)]
fixed build breakage due to bad merge.

Change-Id: I0c6da2e831bfbe770b16a8763513b3d2895f6f60

9 years agoam 838f054f: am a4ea4726: am c461452e: Merge "Hook in user authenticators and their...
Alex Klyubin [Wed, 1 Apr 2015 18:57:38 +0000 (18:57 +0000)]
am 838f054f: am a4ea4726: am c461452e: Merge "Hook in user authenticators and their exceptions."

* commit '838f054f88447d575afff105810800d95dd3eb13':
  Hook in user authenticators and their exceptions.

9 years agoam 93e029e0: am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation...
Alex Klyubin [Wed, 1 Apr 2015 18:57:31 +0000 (18:57 +0000)]
am 93e029e0: am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."

* commit '93e029e0066737f9f09f6dfef95dc664dc236b15':
  A way to obtain KeyStore operation handle from crypto primitives.

9 years agoresolved conflicts for merge of 2094bf7b to master
Wale Ogunwale [Wed, 1 Apr 2015 18:50:31 +0000 (11:50 -0700)]
resolved conflicts for merge of 2094bf7b to master

Change-Id: I1820d186ca602bb3cd21a15f3c23f7d6d309d43b

9 years agoam 3e3af524: am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:43:15 +0000 (18:43 +0000)]
am 3e3af524: am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.

* commit '3e3af5247f7d811f0427bbc1f39fc0582e05f374':
  docs: Fixed a typo.

9 years agoam 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:32:46 +0000 (18:32 +0000)]
am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.

* commit '79c587eda40f3af622f9d1b81aa5a81682e985e4':
  docs: Fixed a typo.

9 years agoam aabcf5b5: am b2255d4f: docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:21:31 +0000 (18:21 +0000)]
am aabcf5b5: am b2255d4f: docs: Fixed a typo.

* commit 'aabcf5b562b6ebad59d1789c73d054782d5f25e4':
  docs: Fixed a typo.

9 years agoam b2255d4f: docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:11:01 +0000 (18:11 +0000)]
am b2255d4f: docs: Fixed a typo.

* commit 'b2255d4f10230b51de373528aaee7b12cc9e2f2b':
  docs: Fixed a typo.

9 years agoam a4ea4726: am c461452e: Merge "Hook in user authenticators and their exceptions."
Alex Klyubin [Wed, 1 Apr 2015 18:04:58 +0000 (18:04 +0000)]
am a4ea4726: am c461452e: Merge "Hook in user authenticators and their exceptions."

* commit 'a4ea47269040963301101b1b1a28d598b41219b8':
  Hook in user authenticators and their exceptions.

9 years agoam f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypt...
Alex Klyubin [Wed, 1 Apr 2015 18:04:54 +0000 (18:04 +0000)]
am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."

* commit 'f00cdf68cd1b96f822b3711cd4e39c9ad903ce21':
  A way to obtain KeyStore operation handle from crypto primitives.

9 years agoam 4e88ecf4: am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
Olawale Ogunwale [Wed, 1 Apr 2015 18:04:50 +0000 (18:04 +0000)]
am 4e88ecf4: am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"

* commit '4e88ecf4bc344557af31eb367e6e01b2d5b60471':
  [ActivityManager] Reduce report wrong anr activity

9 years agoam c461452e: Merge "Hook in user authenticators and their exceptions."
Alex Klyubin [Wed, 1 Apr 2015 17:57:06 +0000 (17:57 +0000)]
am c461452e: Merge "Hook in user authenticators and their exceptions."

* commit 'c461452eb78867032092b2fce14c2fcb3e7ab34e':
  Hook in user authenticators and their exceptions.

9 years agoam c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
Alex Klyubin [Wed, 1 Apr 2015 17:57:00 +0000 (17:57 +0000)]
am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."

* commit 'c6cc9d820d007a6b11df2bb3274d40743e1f1d87':
  A way to obtain KeyStore operation handle from crypto primitives.

9 years agoam 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
Olawale Ogunwale [Wed, 1 Apr 2015 17:56:53 +0000 (17:56 +0000)]
am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"

* commit '086071e7306a73c9b3c5a56277884b4e19543b3e':
  [ActivityManager] Reduce report wrong anr activity

9 years agoMerge "Hook in user authenticators and their exceptions."
Alex Klyubin [Wed, 1 Apr 2015 17:34:36 +0000 (17:34 +0000)]
Merge "Hook in user authenticators and their exceptions."

9 years agoMerge "A way to obtain KeyStore operation handle from crypto primitives."
Alex Klyubin [Wed, 1 Apr 2015 17:34:08 +0000 (17:34 +0000)]
Merge "A way to obtain KeyStore operation handle from crypto primitives."

9 years agoam 1c329e85: am 855998d0: am c90a4418: Merge "idmap: scan missing include for sys...
Mark Salyzyn [Wed, 1 Apr 2015 17:33:31 +0000 (17:33 +0000)]
am 1c329e85: am 855998d0: am c90a4418: Merge "idmap: scan missing include for sys/stat.h"

* commit '1c329e856a1a7cdef6e55ee0269837a234631f75':
  idmap: scan missing include for sys/stat.h

9 years agoMerge "[ActivityManager] Reduce report wrong anr activity"
Olawale Ogunwale [Wed, 1 Apr 2015 17:32:37 +0000 (17:32 +0000)]
Merge "[ActivityManager] Reduce report wrong anr activity"

9 years agoam fa037c65: am f942e36a: am 5218065d: Merge "app_main missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 17:27:21 +0000 (17:27 +0000)]
am fa037c65: am f942e36a: am 5218065d: Merge "app_main missing include for sys/stat.h"

* commit 'fa037c65d37b911024d597415beea3a9368a6fb5':
  app_main missing include for sys/stat.h

9 years agoam 855998d0: am c90a4418: Merge "idmap: scan missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 17:20:54 +0000 (17:20 +0000)]
am 855998d0: am c90a4418: Merge "idmap: scan missing include for sys/stat.h"

* commit '855998d0d1a78b1ab1ba8f012cdadd57f3d942dd':
  idmap: scan missing include for sys/stat.h

9 years agoam c90a4418: Merge "idmap: scan missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 17:11:11 +0000 (17:11 +0000)]
am c90a4418: Merge "idmap: scan missing include for sys/stat.h"

* commit 'c90a44184f775863f4cb7698ed7f92d7b2d83e60':
  idmap: scan missing include for sys/stat.h

9 years agoam f942e36a: am 5218065d: Merge "app_main missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 16:59:44 +0000 (16:59 +0000)]
am f942e36a: am 5218065d: Merge "app_main missing include for sys/stat.h"

* commit 'f942e36a07e8c5e93c1084294350905cebc817a9':
  app_main missing include for sys/stat.h

9 years agoMerge "idmap: scan missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 16:53:53 +0000 (16:53 +0000)]
Merge "idmap: scan missing include for sys/stat.h"

9 years agoidmap: scan missing include for sys/stat.h
Mark Salyzyn [Wed, 1 Apr 2015 14:48:34 +0000 (07:48 -0700)]
idmap: scan missing include for sys/stat.h

scan.cpp gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.

Bug: 19908228
Change-Id: If547e86513b06c536972138ae571c3d9c714ffe9

9 years agoam 5218065d: Merge "app_main missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 16:49:02 +0000 (16:49 +0000)]
am 5218065d: Merge "app_main missing include for sys/stat.h"

* commit '5218065dec34abdb15ee2fb5fffa86207b6b57a8':
  app_main missing include for sys/stat.h

9 years agoMerge "app_main missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 16:28:04 +0000 (16:28 +0000)]
Merge "app_main missing include for sys/stat.h"

9 years agoapp_main missing include for sys/stat.h
Mark Salyzyn [Wed, 1 Apr 2015 14:36:23 +0000 (07:36 -0700)]
app_main missing include for sys/stat.h

app_main.c gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.

Bug: 19908228
Change-Id: I477b825e582742113f849aaa1df50c41e496b6f6

9 years agoam bcfa7cb2: am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread...
Olawale Ogunwale [Wed, 1 Apr 2015 15:37:34 +0000 (15:37 +0000)]
am bcfa7cb2: am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"

* commit 'bcfa7cb2508eb6f606aeef4c6cb44eaf9be07ccf':
  [ActivityManager] Improve multi-thread access the same provider

9 years agoam 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the...
Olawale Ogunwale [Wed, 1 Apr 2015 15:28:16 +0000 (15:28 +0000)]
am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"

* commit '259a649a935ca2ed63419a079211b0ac35f67496':
  [ActivityManager] Improve multi-thread access the same provider

9 years agoConverted more log points in AMS to use ActivityManagerDebugConfig.
Wale Ogunwale [Mon, 30 Mar 2015 21:49:25 +0000 (14:49 -0700)]
Converted more log points in AMS to use ActivityManagerDebugConfig.

Change-Id: I59e777de30e2e9a3c7d086dc634129cd19135fab

9 years agoam 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
Olawale Ogunwale [Wed, 1 Apr 2015 15:18:45 +0000 (15:18 +0000)]
am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"

* commit '6091dcbb80d3b1b885b6e02386ccb3139e5e43ae':
  [ActivityManager] Improve multi-thread access the same provider

9 years agoMerge "[ActivityManager] Improve multi-thread access the same provider"
Olawale Ogunwale [Wed, 1 Apr 2015 14:58:20 +0000 (14:58 +0000)]
Merge "[ActivityManager] Improve multi-thread access the same provider"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 1 Apr 2015 12:35:04 +0000 (12:35 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 1 Apr 2015 12:22:13 +0000 (12:22 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 12:09:43 +0000 (05:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3626ff76ad51e22c35904023ae530f0f2b18b3f1
Auto-generated-cl: translation import

9 years ago[ActivityManager] Reduce report wrong anr activity
riddle_hsu [Wed, 1 Apr 2015 10:58:07 +0000 (18:58 +0800)]
[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

9 years agoam 47121c5e: (-s ours) am 22c93045: (-s ours) am 568039dd: (-s ours) Import translati...
Geoff Mendal [Wed, 1 Apr 2015 10:28:45 +0000 (10:28 +0000)]
am 47121c5e: (-s ours) am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE

* commit '47121c5e1e42e68345b6b994091904549509cfe4':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 10:23:27 +0000 (03:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I72a0fc2dbbf1028462653ee5b97094508c4064c6
Auto-generated-cl: translation import

9 years agoam 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 10:18:24 +0000 (10:18 +0000)]
am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE

* commit '22c930457a3f5848ec699fc79e38c4c0d2e5963a':
  Import translations. DO NOT MERGE

9 years agoam 8dae38f2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 10:12:31 +0000 (10:12 +0000)]
am 8dae38f2: (-s ours) Import translations. DO NOT MERGE

* commit '8dae38f2e51f2f1193523ac87c78192a302668f8':
  Import translations. DO NOT MERGE

9 years agoam 568039dd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 10:07:56 +0000 (10:07 +0000)]
am 568039dd: (-s ours) Import translations. DO NOT MERGE

* commit '568039dda61f9245cd37901c5c2284e6cc79bda4':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 09:55:00 +0000 (02:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I88cb981996fd8f533071e0819c314f63d7036cb1
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 09:49:53 +0000 (02:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I02c4b9d0fcb21c0224590503fa8720805db3d2fa
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Apr 2015 09:46:18 +0000 (02:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import

9 years agoMerge "Revert "Add lockTaskOnLaunch attribute.""
Craig Mautner [Wed, 1 Apr 2015 07:48:07 +0000 (07:48 +0000)]
Merge "Revert "Add lockTaskOnLaunch attribute.""

9 years agoMerge "Revert "Fix build.""
Craig Mautner [Wed, 1 Apr 2015 07:47:50 +0000 (07:47 +0000)]
Merge "Revert "Fix build.""

9 years ago[ActivityManager] Improve multi-thread access the same provider
riddle_hsu [Wed, 1 Apr 2015 07:06:18 +0000 (15:06 +0800)]
[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

9 years agoRevert "Add lockTaskOnLaunch attribute."
Craig Mautner [Wed, 1 Apr 2015 07:02:12 +0000 (00:02 -0700)]
Revert "Add lockTaskOnLaunch attribute."

This reverts commit 0fb1cb56abf708291c09c783463408c7074ae9a7.

9 years agoRevert "Fix build."
Craig Mautner [Wed, 1 Apr 2015 07:02:06 +0000 (00:02 -0700)]
Revert "Fix build."

This reverts commit 37ac0b530a6b290f6fbb677e730daa3506856acb.

9 years agoMerge "Fix build."
Craig Mautner [Wed, 1 Apr 2015 06:59:49 +0000 (06:59 +0000)]
Merge "Fix build."

9 years agoFix build.
Craig Mautner [Wed, 1 Apr 2015 06:58:55 +0000 (23:58 -0700)]
Fix build.

Change-Id: I5d47c9be7867f0f336a12974b90b39d673c8e735

9 years agoA way to obtain KeyStore operation handle from crypto primitives.
Alex Klyubin [Wed, 1 Apr 2015 03:55:10 +0000 (20:55 -0700)]
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

9 years agodocs: Fixed a typo.
Andrew Solovay [Tue, 31 Mar 2015 19:10:47 +0000 (12:10 -0700)]
docs: Fixed a typo.

See first comment for doc stage location.

bug: 19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0

9 years agoHook in user authenticators and their exceptions.
Alex Klyubin [Wed, 1 Apr 2015 02:50:13 +0000 (19:50 -0700)]
Hook in user authenticators and their exceptions.

Bug: 18088752
Change-Id: I2835dbe51d09587a3081597c6aaf536aa1427e24

9 years agoam 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_M...
Alex Klyubin [Wed, 1 Apr 2015 02:20:55 +0000 (02:20 +0000)]
am 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"

* commit '36865896072ee78cae1e987f29340d35a1526f44':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH

9 years agoam f0c71ceb: am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added...
Alex Klyubin [Wed, 1 Apr 2015 02:20:48 +0000 (02:20 +0000)]
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.

9 years agoam c230e190: am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidK...
Alex Klyubin [Wed, 1 Apr 2015 02:20:40 +0000 (02:20 +0000)]
am c230e190: am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."

* commit 'c230e1908f6307913e5af644a6594cc0f9f3fb93':
  Add SecretKeyFactory backed by AndroidKeyStore.

9 years agoam a54f2b16: am 8bed4843: am d720dedb: Merge "Clear the previous states before settin...
Craig Mautner [Wed, 1 Apr 2015 02:20:31 +0000 (02:20 +0000)]
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

9 years agoam 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure...
Yang Ni [Wed, 1 Apr 2015 02:19:41 +0000 (02:19 +0000)]
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.

9 years agoam b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
Alex Klyubin [Wed, 1 Apr 2015 02:05:45 +0000 (02:05 +0000)]
am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"

* commit 'b48ebf4855ec9e158ee88d05618928ff8f5943d1':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH

9 years agoam 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore...
Alex Klyubin [Wed, 1 Apr 2015 02:05:41 +0000 (02:05 +0000)]
am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."

* commit '01e53ef1fc5e3004bfb627d252565305df9a4056':
  Add license banner to recently added AndroidKeyStore files.

9 years agoam 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
Alex Klyubin [Wed, 1 Apr 2015 02:05:37 +0000 (02:05 +0000)]
am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."

* commit '9c0f257f0080aba0743f34fb6202215fca295146':
  Add SecretKeyFactory backed by AndroidKeyStore.

9 years agoam 8bed4843: am d720dedb: Merge "Clear the previous states before setting the new...
Craig Mautner [Wed, 1 Apr 2015 02:05:33 +0000 (02:05 +0000)]
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

9 years agoam 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."
Yang Ni [Wed, 1 Apr 2015 02:05:27 +0000 (02:05 +0000)]
am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."

* commit '5db6f1fafa4990b2d583dcb407be361edc02019d':
  Fix value size data type in closure creation.

9 years agoMerge "Fix SoundPool track recycling for fast tracks"
Andy Hung [Wed, 1 Apr 2015 01:41:59 +0000 (01:41 +0000)]
Merge "Fix SoundPool track recycling for fast tracks"

9 years agoMerge "Add lockTaskOnLaunch attribute."
Craig Mautner [Wed, 1 Apr 2015 01:40:56 +0000 (01:40 +0000)]
Merge "Add lockTaskOnLaunch attribute."

9 years agoam 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
Alex Klyubin [Wed, 1 Apr 2015 01:27:54 +0000 (01:27 +0000)]
am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"

* commit '562c6a71f98e921fe8def18991b2a26f153c683d':
  UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH

9 years agoam b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
Alex Klyubin [Wed, 1 Apr 2015 01:27:48 +0000 (01:27 +0000)]
am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."

* commit 'b7a34e4955beae2cee81a27e7c240316078bbf2f':
  Add license banner to recently added AndroidKeyStore files.

9 years agoam 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
Alex Klyubin [Wed, 1 Apr 2015 01:27:41 +0000 (01:27 +0000)]
am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."

* commit '19e79e12d82fa473f2f7beec337de11a0c3b3a03':
  Add SecretKeyFactory backed by AndroidKeyStore.

9 years agoam d720dedb: Merge "Clear the previous states before setting the new app visibility"
Craig Mautner [Wed, 1 Apr 2015 01:27:34 +0000 (01:27 +0000)]
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

9 years agoam 63dde9c8: Merge "Fix value size data type in closure creation."
Yang Ni [Wed, 1 Apr 2015 01:27:27 +0000 (01:27 +0000)]
am 63dde9c8: Merge "Fix value size data type in closure creation."

* commit '63dde9c88d780fc16a4f2471e405b4f5dc35823c':
  Fix value size data type in closure creation.

9 years agoAdd lockTaskOnLaunch attribute.
Craig Mautner [Tue, 31 Mar 2015 21:36:33 +0000 (14:36 -0700)]
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

9 years agoMerge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
Alex Klyubin [Wed, 1 Apr 2015 00:47:00 +0000 (00:47 +0000)]
Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"

9 years agoMerge "Data usage API: any uid is accessible to system apps running in any user"
Qiwen Zhao [Wed, 1 Apr 2015 00:40:04 +0000 (00:40 +0000)]
Merge "Data usage API: any uid is accessible to system apps running in any user"

9 years agoUNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
Alex Klyubin [Wed, 1 Apr 2015 00:16:31 +0000 (17:16 -0700)]
UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH

This is to follow naming from keymaster_defs.h

Bug: 18088752
Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59

9 years agoMerge "Do not hide any call log entries when they are added."
Santos Cordon [Wed, 1 Apr 2015 00:01:14 +0000 (00:01 +0000)]
Merge "Do not hide any call log entries when they are added."

9 years agoMerge "Fix clobbered shared user install permissions."
Svet Ganov [Tue, 31 Mar 2015 23:59:09 +0000 (23:59 +0000)]
Merge "Fix clobbered shared user install permissions."

9 years agoDo not hide any call log entries when they are added.
Santos Cordon [Thu, 12 Mar 2015 18:51:42 +0000 (11:51 -0700)]
Do not hide any call log entries when they are added.

When a call log entry is added, and it's phone account does not match a
currently registered one, we set it to hidden.  This code was built for
the calllog restore case where call log entries would be hidden when
added if the original phone account wasn't also
present on the new device (where the restore is being performed).

We no longer do that so we're removing the code that sets any call log
entry to hidden.

-- Resubmitting since this change was lost to a merge conflict --

Change-Id: I1ef094d5a35063e8f89cd1ecb1e5a0b59361781c

9 years agoFix clobbered shared user install permissions.
Svet Ganov [Tue, 31 Mar 2015 23:52:11 +0000 (16:52 -0700)]
Fix clobbered shared user install permissions.

The install permissions for a shared user were clobbered when a pending
package for this user was matched to the shared user after reading the
state from XML. The reason was that the copy code in PackageSettingBase was
using the getter to get its settings state to which to copy the permissions
for the pending package but this is the permissions state for the shared
user instead of the package. Since the pending package has no permissions
we ended up clobbering the permissions for the shared user.

bug:19955926

Change-Id: Ia8d090883d50fc987a32ceeed6c7562c49698328

9 years agoMerge "Add license banner to recently added AndroidKeyStore files."
Alex Klyubin [Tue, 31 Mar 2015 23:52:45 +0000 (23:52 +0000)]
Merge "Add license banner to recently added AndroidKeyStore files."

9 years agoAdd license banner to recently added AndroidKeyStore files.
Alex Klyubin [Tue, 31 Mar 2015 23:50:37 +0000 (16:50 -0700)]
Add license banner to recently added AndroidKeyStore files.

Bug: 18088752
Change-Id: I027f9530a02cca081aae8eb94833d2fdcb678e9a

9 years agoMerge "Add SecretKeyFactory backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 23:32:40 +0000 (23:32 +0000)]
Merge "Add SecretKeyFactory backed by AndroidKeyStore."

9 years agoam d684ebd3: am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed...
Alex Klyubin [Tue, 31 Mar 2015 23:01:15 +0000 (23:01 +0000)]
am d684ebd3: am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."

* commit 'd684ebd3a62cb026048d9eebacddb0f824113a5e':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.

9 years agoam 28c51bac: (-s ours) am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert...
Kenny Root [Tue, 31 Mar 2015 23:00:58 +0000 (23:00 +0000)]
am 28c51bac: (-s ours) am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit '28c51bacbde1a2a497e20fa4f299fa653eaac9a3':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

9 years agoMerge "Clear the previous states before setting the new app visibility"
Craig Mautner [Tue, 31 Mar 2015 22:54:26 +0000 (22:54 +0000)]
Merge "Clear the previous states before setting the new app visibility"

9 years agoMerge "Support for nested bundles in setApplicationRestrictions"
Fyodor Kupolov [Tue, 31 Mar 2015 22:52:17 +0000 (22:52 +0000)]
Merge "Support for nested bundles in setApplicationRestrictions"

9 years agoClear the previous states before setting the new app visibility
tiger_huang [Thu, 13 Nov 2014 10:22:44 +0000 (18:22 +0800)]
Clear the previous states before setting the new app visibility

If setAppVisibility() is called multiple times in a short interval
while the screen is turned off between the calls, the visibility of
the app would be wrong. For example, the user may see the app under
the launcher, not the wallpaper under the launcher.

The flow to the issue:
1. Screen is on.
2. AM calls setAppVisibility() token=App A's token, visible=true
3. Screen is turned off.
4. AM calls setAppVisibility() token=App A's token, visible=false

Note:
a. In 2., WM would put App A into mOpeningApps, and tell it to be
   visible.
b. In 4., because the screen is off now, App A would not be removed
   from mOpeningApps. App A might be told to be invisible directly
   through setTokenVisibilityLocked(), but it would be told to be
   visible again in handleAppTransitionReadyLocked() later.

Change-Id: Icf3d69031ea2822245008248ec8f12bd57218880

9 years agoAdd SecretKeyFactory backed by AndroidKeyStore.
Alex Klyubin [Tue, 31 Mar 2015 22:26:56 +0000 (15:26 -0700)]
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

9 years agoMerge "Add CameraService to system server."
Ruben Brunk [Tue, 31 Mar 2015 22:27:52 +0000 (22:27 +0000)]
Merge "Add CameraService to system server."

9 years agoMerge "Clear the previous states before setting the new app visibility"
Craig Mautner [Tue, 31 Mar 2015 22:22:46 +0000 (22:22 +0000)]
Merge "Clear the previous states before setting the new app visibility"

9 years agoUnhide new ScriptGroup API
Yang Ni [Mon, 16 Mar 2015 23:23:50 +0000 (16:23 -0700)]
Unhide new ScriptGroup API

This includes the new class ScriptGroup2 and a related change in
class Script to add InvokeID.

Change-Id: I012dc0a32c65803453022fa534ef05f855ea5ace

9 years agoMerge "Fix value size data type in closure creation."
Yang Ni [Tue, 31 Mar 2015 21:32:23 +0000 (21:32 +0000)]
Merge "Fix value size data type in closure creation."

9 years agoam 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKey...
Alex Klyubin [Tue, 31 Mar 2015 21:20:51 +0000 (21:20 +0000)]
am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."

* commit '0bd10c21ff1bb00f178738301ad4663c7cebd28f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.

9 years agoam 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 21:13:49 +0000 (21:13 +0000)]
am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."

* commit '5960c3d56614830439718e93968e0c7d2727262f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.

9 years agoMerge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 21:00:16 +0000 (21:00 +0000)]
Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."

9 years agoAdd unauthenticated AES ciphers backed by AndroidKeyStore.
Alex Klyubin [Tue, 31 Mar 2015 20:39:38 +0000 (13:39 -0700)]
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

9 years agoMerge "[RenderScript] Remove @hide for setAutoPadding(boolean)."
Miao Wang [Tue, 31 Mar 2015 19:41:01 +0000 (19:41 +0000)]
Merge "[RenderScript] Remove @hide for setAutoPadding(boolean)."