175062 Commits

Author SHA1 Message Date
Narayan Kamath
4993da924c Merge "Patches for IKeyguardStateCallback" 2015-05-29 09:26:17 +00:00
dooyoung.hwang
516dad0625 Patches for IKeyguardStateCallback
1. Also notify input is restricted or not when IKeyguardStateCallback callback is added.
When first Keyguard is showing after boot, the mInputRestricted is not updated. So,
inKeyguardRestrictedInputMode still returns false, although device is locked.

2. If mShowing remains false during setup time of KeyguardViewMediator, mInputRestricted
is not updated. This is because updateInputRestrictedLocked is called only if showing
value is changed during setup time.
For this reason, when device is not provisioned, inKeyguardRestrictedInputMode returns
false, and device does not restrict key.

3. If one of callbacks causes RemoteException, the other callbacks are not called.
This is because catching RemoteException breaks for-loop.

Change-Id: I0281405127bcc75285b908d01485da3ac9b40b52
Signed-off-by: Dooyoung Hwang <dooyoung.hwang@lge.com>
2015-05-29 09:26:04 +00:00
Narayan Kamath
90cfc1923a Merge "Close race condition in binderDied()" 2015-05-29 08:34:02 +00:00
Christopher Tate
140f2b41af Close race condition in binderDied()
It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort.  We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.

Bug 15831054

(cherry picked from commit 090c08ff2a7525c830b4edfd1a79aa8ee3893c60)

Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab
2015-05-29 08:33:52 +00:00
David Srbecky
3976a56904 Merge "Replace --include-cfi with --generate-debug-info." 2015-05-28 18:37:37 +00:00
Evgenii Stepanov
495ebb119b Merge "Update asan/app_process." 2015-05-28 18:31:07 +00:00
David Srbecky
f39477b592 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-05-28 17:16:09 +01:00
Chris Tate
d2b63ff8b2 Merge "Fix bug regarding the comparator sorts Alarms into increasing time order." 2015-05-27 23:53:33 +00:00
jinho.park
df7f900cf4 Fix bug regarding the comparator sorts Alarms into increasing time order.
The comparator used variable "when" in IncreasingTimeOrder class.
variable "when" means "elapsed time" or "real time"(RTC) and these types have different unit of time.
so, I recommend that you use a "whenElapsed" which has the equal unit of time as its default value.

Change-Id: I248863ef8a5c49cc7114cb2965f3d6b78f4faa59
Signed-off-by: Jinho Park <jinho.park@lge.com>
2015-05-27 14:44:18 +09:00
Narayan Kamath
3f453164ec Merge "Pass charset to XmlPullParser.setInput instead of null" 2015-05-22 09:30:46 +00:00
Wojciech Staszkiewicz
4f11754f72 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

(cherry picked from commit 9e9e2e73c6ec7bece20268196dc89ad0c8bafad4)

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-22 10:26:31 +01:00
Narayan Kamath
d3916c885b Merge "Fix application moves." 2015-05-22 08:30:10 +00:00
Narayan Kamath
561e13d687 Fix application moves.
We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.

This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.

bug: 21337469

(cherry picked from commit cd251fa382e887f59c278d4d7cd0a858812c6114)

Change-Id: Id1ed3bdfabb41e05e6a2f7efbd05d2103a67c663
2015-05-22 08:29:54 +00:00
Narayan Kamath
8f9339d0d7 Merge "Throw a checked exception on inconsistent installs." 2015-05-22 08:29:45 +00:00
Narayan Kamath
a96ecf7821 Throw a checked exception on inconsistent installs.
Allows us to proceed without crashing the system process. Also,
complete an incomplete error message. Follow up comments from
change b904863476991d8540d37d5.

bug: 21144503

(cherry picked from commit c52ae28006605fb2da38b305b60b9bb419aa2f80)

Change-Id: I47b8762449714162fcd5c16eba6fcc146b93120b
2015-05-22 08:29:32 +00:00
Narayan Kamath
3178e9f6e8 Merge "Scan package to derive ABIs before optimizing." 2015-05-22 08:29:20 +00:00
Narayan Kamath
2b6d792ad5 Scan package to derive ABIs before optimizing.
This requires a minor refactor to extract the ABI detection logic
out of scanPackageDirtyLI.

Note that there's a minor regression here : we ignore the
cpuAbiOverride from the package settings when calculating the
CPU ABI. This is OK (and possibly better behaviour) because this
is only a debug only option (for adb install) AND because the instructions
require users to specify the abi override on every adb install
invocation. Furthermore, the behaviour when an ADB installed app
(with an override) is auto-updated is more consistent.

bug: 21144503

(cherry picked from commit b904863476991d8540d37d542c0a49b78deab680)

Change-Id: I1eb88b808fd2e90e14c32322131659220aafdb7a
2015-05-22 08:29:07 +00:00
Narayan Kamath
2e06258c45 Merge "Do not create oat directory for an app in ASEC container" 2015-05-22 08:28:52 +00:00
Fyodor Kupolov
589f2b53f2 Do not create oat directory for an app in ASEC container
Currently installation fails, if an app is located on SD card (inside ASEC).
If an app is located inside ASEC, dexopt output should go to
/data/dalvik-cache. dexopt also needs to be performed at a later stage,
because the name of the oat file contains the absolute path to the dex file.

Bug: 20452651
Bug: 21360107

(cherry picked from commit 94056d1cb8183bde3e942336735b289b9654deb1)

Change-Id: Id1ced7159e5af9c05be0b637437b3b260e859c1d
2015-05-21 19:42:34 +01:00
Stephen Hines
3385b6169f Merge "Added in flag to ask context to wait for debugger attach." 2015-05-21 16:23:37 +00:00
Yohann Roussel
2db531ee1b Merge "[DO NOT MERGE] Allow compilation with Jack." 2015-05-21 09:23:48 +00:00
Jean-Luc Brouillet
d76727637e Merge "Clean RenderScript warnings" 2015-05-20 18:24:58 +00:00
Jean-Luc Brouillet
8b1e95b0e5 Clean RenderScript warnings
Change-Id: Ia7a98c1c977c839c74ae8081e70b5deb4b60c25d
2015-05-19 17:45:30 -07:00
Fyodor Kupolov
5053258e20 Merge "Allow creating a managed profile if there is only one user." 2015-05-19 17:47:03 +00:00
Miao Wang
7787760961 Merge "[RenderScript] fix Allocation.copyToFieldPacker" 2015-05-19 16:45:13 +00:00
Yohann Roussel
7bcaf9a997 [DO NOT MERGE] Allow compilation with Jack.
Adapt to Jack compilation specifics.

Fix bad import in VideoDumpActivity.
The extra semicolumn is ignored by javac because of
https://bugs.openjdk.java.net/browse/JDK-8027682 but is not
permitted by ecj or Jack.

This includes cherry-picks of the following changes:
248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf
705555dc468e46560d02db102dfcedc1e5c70d9e
f50a51fb4c8d5ca973ce910a21bddf9f8466cb51
bf5ad8d9943c0e1b0b3f1b4524c277f369065d08

Change-Id: Ifbe063e3822a7d63b1681921b9788cfca898ba64
2015-05-19 18:17:39 +02:00
Alex Klyubin
838a7e50eb Merge "Switch from getSpi to getCurrentSpi." 2015-05-18 19:08:33 +00:00
Nicolas Prevot
12678a99f1 Allow creating a managed profile if there is only one user.
BUG:21119929

Change-ID: Ice1cf25f8ae8199228f828d22118c94b9e11b567
2015-05-18 10:48:16 -07:00
Alex Klyubin
bdc1382ac5 Switch from getSpi to getCurrentSpi.
Crypto primitives' getSpi has a side-effect which modifies the state
of the primitive: it selects an SPI implementation if it hasn't been
selected yet (e.g., Cipher.getInstance("AES") doesn't select an SPI
implementation until Cipher.init). The new method getCurrentSpi has
no side-effects: it simply returns null if no SPI implementation is
selected. The switch to getCurrentSpi lets us avoid side-effects and
throw a more pertinent exception when no SPI is yet selected.

Bug: 18088752
Change-Id: I6d62eb67f904a15782673d16bcdae240cdc8f979
2015-05-18 09:54:54 -07:00
Chad Brubaker
a194eb9b5d Merge "Cleanup Keystore API" 2015-05-15 19:54:34 +00:00
Olawale Ogunwale
354be7cd87 Merge "Use the correct parent size to initialize animations" 2015-05-15 17:23:07 +00:00
Olawale Ogunwale
4857c1d885 Merge "Fix lost singleton provider after force-stopping user or package." 2015-05-15 17:13:02 +00:00
Olawale Ogunwale
d80f23e5c3 Merge "Also restart provider if there is external handle." 2015-05-15 16:19:46 +00:00
riddle_hsu
daf23d9c77 Fix lost singleton provider after force-stopping user or package.
Case 1 (name == null):
Switch user from guest to owner. All processes of guest
will be killed, it will not include processes which singleton
components live in, but singleton provider records are still
collected and removed.

When the user switch is complete and the process of removed
singleton provider is still alive, there is someone access
the provider, it will create a new ContentProviderRecord and
wait but no one will notify it because the provider process
is alive with different ContentProviderRecord.

Then the access cannot get response unless the process of target
provider is died and restarted.

Case 2 (name != null):
Switch to another non-guest user, launch an application which
contains singleton provider. Go to Settings to force-stop the
package then switch back to owner user. Launch an application
which will access the singleton provider. It will also cannot
get response that similar as case 1.

Solution:
Only collect singleton provider if target user is all or owner.

Change-Id: Ic6828da66645172d1378cfb1f66d092df5966516
2015-05-15 11:33:03 +08:00
Chad Brubaker
d8aacca3a1 Cleanup Keystore API
Rename confusingly named methods, add userID arguments to all methods
that operate on user state and delete methods that have been replaced by
the onUser* methods.

Some of the old methods have been kept in KeyStore.java in order to ease
the transition of various system packages to the new methods.

Change-Id: Ic271689d62c36d255c5adee26c7abc2e7ed24df5
2015-05-14 13:49:25 -07:00
Stephen McGroarty
62cb9bdc9d Added in flag to ask context to wait for debugger attach.
Adds in flag CREATE_FLAG_WAIT_FOR_ATTACH with value 0x0008 to the RenderScript API
to be passed down to the C++ implementation to tell it to wait for a debugger to be
attached before executing the kernel.

Change-Id: Ibc4e903efbed1b1fb14cf378d1a8517d5c8d1f26
Signed-off-by: Stephen McGroarty <stephen@codeplay.com>
2015-05-14 18:01:01 +01:00
Chris Tate
7b566da55a Merge "AlarmClockInfo: fix redundant word in doc comment" 2015-05-14 01:20:53 +00:00
Shuhrat Dehkanov
66729ff685 AlarmClockInfo: fix redundant word in doc comment
Removed one of unintentional double "intent"s.

Change-Id: I0ce4224964afae0587ce55b6b4775370eff89d26
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2015-05-14 10:07:25 +09:00
Jason Sams
b498b2d273 Merge "Fix issues found during CTS testing of FP16" 2015-05-14 00:53:17 +00:00
Jason Sams
54371b4b09 Fix issues found during CTS testing of FP16
bug 20822382

This corrects a copy&paste error placing F16 into F32.
Fixes an error disallowing vectors of fp16 types.

Change-Id: I34be1aa9a323d61a7121581ab9599d2c2d32dd42
2015-05-13 17:02:36 -07:00
Hiroshi Yamauchi
463a5db1d2 Merge "Replace JNI primitive array critical calls with non-critical ones." 2015-05-13 22:47:59 +00:00
Hiroshi Yamauchi
3b1d46e809 Replace JNI primitive array critical calls with non-critical ones.
The files generated by glgen + manually edited util.cpp.

(cherry pick commit 5b406cb7b548443b589f0acb235c8a7465ffb82b)

Bug: 19235243
Change-Id: I9ab79c36e4ac6e123296b06ee8e4c04c4f583104
2015-05-13 13:10:33 -07:00
riddle_hsu
691a1737a3 Also restart provider if there is external handle.
e.g. ContentResolver.getType will call
ActivityManagerService.getProviderMimeType
that will not have connection but increase
externalProcessNoHandleCount.

Change-Id: I649c0b2390a749c77c6be5e7dfadc1acb689ec4c
2015-05-13 18:59:03 +08:00
Chad Brubaker
875607d97f Merge "Add keystore onUserAdded/Removed methods" 2015-05-12 23:26:35 +00:00
Chad Brubaker
31c2897105 Add keystore onUserAdded/Removed methods
Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
2015-05-12 13:24:43 -07:00
Olawale Ogunwale
9c32e1022b Merge "Don't apply animation clip to dialog activities" 2015-05-12 16:50:35 +00:00
Miao Wang
bfa5e659e7 [RenderScript] fix Allocation.copyToFieldPacker
Change-Id: Iaba3333f9741238745fdb5c94f1b27b1015d50b2
2015-05-11 15:49:18 -07:00
Chad Brubaker
0ecc6c2799 Merge "Cleanup keystore password changing and unlocking" 2015-05-11 19:30:40 +00:00
Miao Wang
5f21193b39 Merge "[RenderScript] (minor) fix validation of L3 BLAS" 2015-05-11 19:20:47 +00:00
Miao Wang
cce01f480f [RenderScript] (minor) fix validation of L3 BLAS
bug: 21028875

Change-Id: I9fd48c57b6518e06ee1d9d7d4ca44faa96d887b0
2015-05-11 12:19:33 -07:00