Commit Graph

50642 Commits

Author SHA1 Message Date
Jorim Jaggi
2a39aef439 Merge "Fix crash when removing draw listener" 2015-04-08 18:11:44 +00:00
Jorim Jaggi
74a94059c6 Fix crash when removing draw listener
The same behavior can be achieved by using a predraw listener, which
can be removed while the callback is called, so it doesn't crash.

Change-Id: I3a7138ba49936159dc95b7758c9603366dcf808c
2015-04-08 10:47:22 -07:00
Olawale Ogunwale
8d86acf6c5 am 81954cf3: am 8ddc3e26: am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"
* commit '81954cf30816a007186fbf3be375feed5a7936cc':
  [ActivityManager] Avoid NullPointerException if no crash info
2015-04-08 16:51:01 +00:00
Olawale Ogunwale
8ddc3e26e6 am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"
* commit '393f89f26df724a3da7a21b28925a21fe5fb253f':
  [ActivityManager] Avoid NullPointerException if no crash info
2015-04-08 16:28:52 +00:00
Benjamin Franz
f63afe7b33 Merge "Allow disabling the lock screen when multiple users are present" 2015-04-08 15:02:43 +00:00
Chet Haase
81b924fcb6 Merge "Animate ActionBar items" 2015-04-08 14:11:38 +00:00
louis_chang
3d86b88fa7 [ActivityManager] Avoid NullPointerException if no
crash info

Symptom:
This issue happens because the ANR process got killed
(because it crashed) before the ANR dialog dismissed.
In that case, the process record is marked as crashed
(ProcessRecord.crashing = true). When the ANR dialog
dismissed by user, it will cause NullPointerException
when writeToParcel while performing IPC because there
is no crash info (ApplicationErrorReport.crashInfo = null)

Solution:
Check crashinfo before access it

Change-Id: I2995de57684c1e13aab8297f5eea1e82ca3b7ad8
2015-04-08 18:04:11 +08:00
Clara Bayarri
2f92e9710a Merge "Floating toolbar: Create the FloatingActionMode and use it in DecorView." 2015-04-08 08:00:01 +00:00
Romain Guy
492c836f83 am 5b61a282: am e4d787b2: am 80e455e3: Merge "Prevent possible memory leak in SpanSet"
* commit '5b61a282255b5273f5194db73f3c88550dc11a57':
  Prevent possible memory leak in SpanSet
2015-04-08 07:38:58 +00:00
Romain Guy
e4d787b277 am 80e455e3: Merge "Prevent possible memory leak in SpanSet"
* commit '80e455e32580fb909af18ad0a21fccc6b433dd4b':
  Prevent possible memory leak in SpanSet
2015-04-08 07:14:35 +00:00
Romain Guy
80e455e325 Merge "Prevent possible memory leak in SpanSet" 2015-04-08 06:56:26 +00:00
Selim Gurun
6dc7ca3040 Merge "Fix Google app crash" 2015-04-08 01:54:45 +00:00
Selim Gurun
7e01c4ceb6 Fix Google app crash
Bug: 20110378

Until chromium imlementation lands, use the base implementation.

Change-Id: Icd8e83503770471219718fb38a131938b1bbf0c2
2015-04-07 18:40:14 -07:00
Fabrice Di Meglio
9f3f6000ed Merge "Add IntentFilter auto verification - part 3" 2015-04-08 00:30:37 +00:00
Fabrice Di Meglio
0788595e0c Add IntentFilter auto verification - part 3
- add private API PackageManager.getAllIntentFilters(String)
for getting all IntentFilters from a given package
- update IntentFilterVerificationInfo to use an ArrayList<String>
for domains instead of a String[]
- if you make an App a default domain handler then make the
others as non default
- create an IntentVerificationInfo even if the App IntentFilters
do not need to be verified. This would be done only if the App
has some domain URLs defined and would allow to make it the
default handler for a domain
- a few code optimizations here and there

Change-Id: I4535372a0bb1a2c8e662e1485be8ca700003e9b3
2015-04-07 17:13:32 -07:00
Adam Lesinski
0dfd7fba38 Merge "Adding per UID WiFi power distribution." 2015-04-07 23:51:17 +00:00
Chet Haase
952cba2e07 Animate ActionBar items
Chnages to the ActionBar are now tracked so that new items,
items that go away, and items that change location are now animated into
their new state.

Issue #10863316 action bar items don't fade in correctly

Change-Id: Ia956b2b76958f02108c756dab2d1c2617a5904dc
2015-04-07 16:26:32 -07:00
Alan Viverette
7f9f68f8a0 Merge "Fix hours in clock" 2015-04-07 22:54:49 +00:00
Alan Viverette
fc76a64be7 Fix hours in clock
Bug: 20096871
Change-Id: Ib4f155f6b6221bd2a41af86a018d42ddea372950
2015-04-07 15:37:30 -07:00
Adam Powell
a3f3a309cd am 66a51c70: am da1bc605: am 7a3c8c70: Merge "Fixed memory leak in ExtractEditLayout finish()"
* commit '66a51c7080f26219652f84ae8d10b1e4d63409af':
  Fixed memory leak in ExtractEditLayout finish()
2015-04-07 22:02:48 +00:00
Adam Powell
20a2ef45e1 am f401d637: am 947b5029: am 8391e03b: Merge "ProgressBar: Fix error of process bar cannot update on some condition."
* commit 'f401d63796d9a7f81e8d1a4adf6ae2615faa7d91':
  ProgressBar: Fix error of process bar cannot update on some condition.
2015-04-07 22:02:38 +00:00
Stephen Hines
b6b17a575f resolved conflicts for merge of 764f08ad to master
Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3
2015-04-07 14:47:32 -07:00
Adam Powell
da1bc60574 am 7a3c8c70: Merge "Fixed memory leak in ExtractEditLayout finish()"
* commit '7a3c8c70a6c745aa2559a7f769528774021b62a6':
  Fixed memory leak in ExtractEditLayout finish()
2015-04-07 21:23:58 +00:00
Adam Powell
947b5029e5 am 8391e03b: Merge "ProgressBar: Fix error of process bar cannot update on some condition."
* commit '8391e03b7ef20f22ffc31da43e01b2fb8d1ec00a':
  ProgressBar: Fix error of process bar cannot update on some condition.
2015-04-07 21:23:50 +00:00
Tim Murray
d782c57d37 am 5352411a: Merge "Move cache dir to its own class."
* commit '5352411a8c41dd1c3c51a28cdd0b09f42e246b33':
  Move cache dir to its own class.
2015-04-07 20:59:39 +00:00
Adam Powell
7a3c8c70a6 Merge "Fixed memory leak in ExtractEditLayout finish()" 2015-04-07 20:56:49 +00:00
Adam Powell
8391e03b7e Merge "ProgressBar: Fix error of process bar cannot update on some condition." 2015-04-07 20:56:36 +00:00
Tim Murray
5352411a8c Merge "Move cache dir to its own class." 2015-04-07 20:34:21 +00:00
Tim Murray
e1e6c66198 Move cache dir to its own class.
This prevents us from loading the RS static initializer all the time.

Change-Id: I8cea7540e50251aba8c2f199f06f344f991e7d7f
2015-04-07 13:24:14 -07:00
Jeff Brown
b4140e4251 Merge "Fix animation start jank due to expensive layout operations." 2015-04-07 19:28:57 +00:00
Jeff Brown
c42b28dda4 Fix animation start jank due to expensive layout operations.
The Choreographer carefully schedules animation updates to occur
after input but before traversals occur.  This ensures that the
effects of animations are perceived immediately in the next frame.
The start time of animation is usually set the moment the animator
first runs.  The start time serves as a reference for timing the
remainder of the animation.

Setting the start time during the animation callback works well except
when traversals take a long time to complete.  In that case, we may
end up drawing the initial frame of the animation then skipping several
following frames (because a lot of time has already passed since the
animation start time was set), effectively shortening the duration
of the animation.

To resolve this issue, we introduce a new COMMIT phase within the
Choreographer.  The COMMIT callback runs after traversals complete
and may provide an updated frame time that more accurately reflects
the time when the frame finished drawing.

In the case where an animation is just starting, we note the fact
that its initial start time has not yet been committed (the user
hasn't actually seen anything on screen yet).  Then, during the
COMMIT phase, we adjust the animation start time to better reflect
the time when the animation's first frame was drawn, effectively
causing the animation actually start after the expensive traversal
operations occurred such that no frames will be skipped.

Bug: 17258911
Change-Id: I279603d01fd4ed1de8f51a77c62f4fec5e9b746a
2015-04-07 12:27:17 -07:00
Jorim Jaggi
25ff0646ca Merge "Add Camera prewarm intent." 2015-04-07 18:50:54 +00:00
Alex Klyubin
1620a65d32 resolved conflicts for merge of 06adabdb to master
Change-Id: Ifb09e2e6242f79cabe76e95eacc982f6cc7e1a6c
2015-04-07 11:39:51 -07:00
Adam Lesinski
e08af19fcc Adding per UID WiFi power distribution.
Change-Id: I88c539074607d7261f6c5cf1dbae47c3cf53f253
2015-04-07 11:37:10 -07:00
Jorim Jaggi
a86790bf23 Add Camera prewarm intent.
Also adds a test app for testing this intent. In addition, the secure
camera gets launched in the background to fix jank while sending the
intent.

Bug: 20016619
Change-Id: I7bb7e22ddaf5dc67fc09b9e63e5f3d10fe8e3ee4
2015-04-07 11:24:05 -07:00
Romain Guy
b3a9bc038d Prevent possible memory leak in SpanSet
If SpanSet.init() is called several times in a row with different
values, it is possible to change "numberOfSpans" in a way that
will prevent SpanSet.recycle() from nulling out all the spans.

This can lead to memory leaks of large objects through spans
references. User @piwai reported this leak:

     com.squareup.marketfont.MarketSpan
     `-[1] of array android.text.style.CharacterStyle[]
       `-spans of object android.text.SpanSet
         `-mCharacterStyleSpanSet of object android.text.TextLine
           `-[1] of array android.text.TextLine[]
             `-sCached of class android.text.TextLine

The MarketSpan instance is kept alive through a recycled TextLine
which itself contains a SpanSet.

Change-Id: Idfb2233ca16895dbe735c312662eaf0b4a2ecd65
2015-04-07 11:07:05 -07:00
Alex Klyubin
4b79bbeaa3 am 558184f5: Merge "Make the new AndroidKeyStore API conformant."
* commit '558184f52fa7822a0bde230a93e552f137ac91a4':
  Make the new AndroidKeyStore API conformant.
2015-04-07 17:58:00 +00:00
Dmitriy Ivanov
aa94389ba2 am d95e58cb: Merge "Load libraries directly from apk"
* commit 'd95e58cb609228c4c4b231e00d6bb648e9dcaf71':
  Load libraries directly from apk
2015-04-07 17:49:12 +00:00
Alex Klyubin
558184f52f Merge "Make the new AndroidKeyStore API conformant." 2015-04-07 17:39:08 +00:00
Dmitriy Ivanov
d95e58cb60 Merge "Load libraries directly from apk" 2015-04-07 17:28:15 +00:00
Dmitriy Ivanov
dec4688f40 Load libraries directly from apk
Introduced new 'extractNativeLibs' attribute to manifest/application.
 Setting it to false prevents installer from extracting library from apk.

 The default value for extractNativeLibs is true.

Bug: 8076853
(cherry picked from commit ff193d642e)
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-04-07 17:25:23 +00:00
Alan Viverette
61cbc1f74f Merge "Add accessibility action for scrolling to a collection position" 2015-04-07 17:21:08 +00:00
Alex Klyubin
c46e9e7da4 Make the new AndroidKeyStore API conformant.
This makes the new AndroidKeyStore API conform with the latest
Keymaster API changes as well as the latest Android framework API
design guidelines.

Keymaster changes:
* Multiple paddings, block modes, and digests can be set on a key.
* "max uses per boot" and "min seconds between use" restrictions will
  not be exposed in the framework API.
* Padding scheme ZERO will not be exposed.

Changes due to Android framework design guidelines:
* Sets of enum values have been replaced with bitsets represented as
  ints.
* Integer has been replaced with int, with null being represented
  with a special value (e.g., -1 or 0) where possible.

Bug: 18088752
Change-Id: Ib21739aa9b42d48895cb7a681e836a5c6d972ac6
2015-04-07 09:18:00 -07:00
Craig Mautner
30b8984903 Merge "No longer unlock activity manager to test whitelist" 2015-04-07 16:17:57 +00:00
Craig Mautner
e56007786a No longer unlock activity manager to test whitelist
In order to check the DevicePolicyManagerService locktask whitelist
the activity manager had to release its lock preserving internal
state. That is undesirable and not scalable now that we need to check
the whitelist at startup for bug 19995702.

This change causes DPMS to update activity manager with the whitelist
whenever it changes so that activity manager can check the whitelist
without releasing the acitivty manager lock.

Change-Id: I3ed6eb5ceae2cd7e7ae3280abd708d5ce43a2851
2015-04-07 09:15:41 -07:00
George Mount
b6d8a84336 Merge "Fix NPE in getForegroundTintList" 2015-04-07 15:52:59 +00:00
Benjamin Franz
51ed794e2f Allow disabling the lock screen when multiple users are present
Disallowing disabling the lock screen when multiple switchable users
are present on the device was a legacy from the time when the lock
screen was the only way of switching between users. As we offer other
ways to switch users now, e.g. quick settings, we no longer need this
check.

Also introduce a per user version of disabling the lock screen.

Bug: 19962043
Change-Id: I131568a5dadd1706762b8a626e8f9b06e973b7ae
2015-04-07 16:34:56 +01:00
Narayan Kamath
9d1878674c Merge "Don't set userSetLocale from Configuration.setLocale." 2015-04-07 13:08:18 +00:00
Clara Bayarri
9b8178719b Merge "Create the Process Text Intent Action and Extra" 2015-04-07 12:52:31 +00:00
Clara Bayarri
0a26157a9f Create the Process Text Intent Action and Extra
Change-Id: I33e30324970e91b04fcc233b91c9d43580c446fc
2015-04-07 13:49:54 +01:00