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

147177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
348ca04d81 am ced4e24b: am 4b71e7f7: Merge "Fix visibility propagation check." into lmp-dev 
* commit 'ced4e24b4e81d647ab62b141777fe9b5c04326a0':
  Fix visibility propagation check.
 2014-07-31 17:29:53 +00:00
riddle_hsu
0b915b71ad am ac050e9e: am 5b94ec47: [ActivityManager] Avoid mistaking visibility by finishing task. 
* commit 'ac050e9ebbe7dde7cbbf32354d2a2ba76da1163c':
  [ActivityManager] Avoid mistaking visibility by finishing task.
 2014-07-31 17:29:49 +00:00
George Mount
84089e0343 am 4b71e7f7: Merge "Fix visibility propagation check." into lmp-dev 
* commit '4b71e7f7b03844126df844015004f00e8f19afe9':
  Fix visibility propagation check.
 2014-07-31 17:25:59 +00:00
riddle_hsu
a1404fd114 am 5b94ec47: [ActivityManager] Avoid mistaking visibility by finishing task. 
* commit '5b94ec47e84d5e1d116fc281e81d9164f496a388':
  [ActivityManager] Avoid mistaking visibility by finishing task.
 2014-07-31 17:25:54 +00:00
destradaa
95eb76b440 am 13fcdab4: am 7efb7d49: Fix crash in Volantis because there is not FLP support. 
* commit '13fcdab467b42dc79652f2b082700c361c1f8002':
  Fix crash in Volantis because there is not FLP support.
 2014-07-31 17:25:30 +00:00
Roozbeh Pournader
ef7717fea4 am 1ef9f363: am cac26f40: Crunch Roboto and fix its digits to have the same width. 
* commit '1ef9f363a81c55a5af7fb1cb0d038b1ff4dcb145':
  Crunch Roboto and fix its digits to have the same width.
 2014-07-31 17:25:25 +00:00
riddle_hsu
9bcc6e83d9 [ActivityManager] Avoid mistaking visibility by finishing task. 
Cherry-picked from aosp into lmp-dev.

Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
            // If starting in an existing task, find where that is...
            boolean startIt = true;
            for (int i = NH-1; i >= 0; i--) {
                ActivityRecord p = mHistory.get(i);
                if (p.finishing) { // <--
                    continue;
                }

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee

Conflicts:
	services/java/com/android/server/am/ActivityStack.java
 2014-07-31 17:07:39 +00:00
destradaa
f35c97a6fd am 7efb7d49: Fix crash in Volantis because there is not FLP support. 
* commit '7efb7d491c973d3605ab61996ee83b502d9ee765':
  Fix crash in Volantis because there is not FLP support.
 2014-07-31 17:05:00 +00:00
Roozbeh Pournader
ee20b21ff9 am cac26f40: Crunch Roboto and fix its digits to have the same width. 
* commit 'cac26f40512f7548ed3ff75fa37ea6aa837cd545':
  Crunch Roboto and fix its digits to have the same width.
 2014-07-31 17:04:50 +00:00
destradaa
beea442e72 Fix crash in Volantis because there is not FLP support. 
b/16690237

Change-Id: Ie2dd159ad4e9b5cf4b3e2e66023b456927f18130
 2014-07-31 17:02:01 +00:00
Mike Lockwood
b61861d176 am 6871e3bc: am 72dff5d5: Add toString() methods to some audio classes to help with debugging. 
* commit '6871e3bce2c02f5ee4ecbdfb22eb9c52af458275':
  Add toString() methods to some audio classes to help with debugging.
 2014-07-31 17:00:14 +00:00
Roozbeh Pournader
fa4aeeeb71 Crunch Roboto and fix its digits to have the same width. 
Update to upstream version 2.001045, which adds fontcrunch to the font
production process and fixes a problem with uneven digit widths. Should fix
https://code.google.com/p/android-developer-preview/issues/detail?id=330.

The font footprint is reduced by 705KB, most of it due to the crunching, but
also by using a newer version of fonttools that removes extra unnecessary
paddings from the glyf table.

Bug: 15348046
Bug: 16296048
Bug: 16299966

Change-Id: I838711916f8c47db011cfe889b232e60e6f1aa0c
(cherry picked from commit 6feb729b686b902be2520a91281e1a000c055da2)
 2014-07-31 16:56:15 +00:00
Mike Lockwood
08b7c4fb3a am 72dff5d5: Add toString() methods to some audio classes to help with debugging. 
* commit '72dff5d5264643305108b17b5e76ba3324f5e32b':
  Add toString() methods to some audio classes to help with debugging.
 2014-07-31 16:54:49 +00:00
Sandeep Siddhartha
a542651bf8 am 2120e854: am 9428457f: Merge "Don\'t unload sound model in start recognition unless the model changes" into lmp-dev 
* commit '2120e8549f15fd7100d2b0cc2d2da79ee7f076b1':
  Don't unload sound model in start recognition unless the model changes
 2014-07-31 16:51:18 +00:00
Mike Lockwood
2754fd0cd3 Add toString() methods to some audio classes to help with debugging. 
Change-Id: I2b61d8cdfbcaa7671705771325205b074c50ab1e
 2014-07-31 16:50:02 +00:00
Sandeep Siddhartha
9e6357b2d0 am 9428457f: Merge "Don\'t unload sound model in start recognition unless the model changes" into lmp-dev 
* commit '9428457f4f1a902a1908f7a9f9ed718f92435a4f':
  Don't unload sound model in start recognition unless the model changes
 2014-07-31 16:45:32 +00:00
Evan Charlton
626063a511 am 7fedbd06: am 0e097002: Fix a small typo in javadocs 
* commit '7fedbd065c6208603565273b50035594fc46e46f':
  Fix a small typo in javadocs
 2014-07-31 16:21:13 +00:00
Evan Charlton
7a547177cd am 0e097002: Fix a small typo in javadocs 
* commit '0e0970022cdf105e073b182cc4e72e54c3f8eecd':
  Fix a small typo in javadocs
 2014-07-31 16:16:56 +00:00
Craig Mautner
48e436cd1f am b442d922: am 4895bf78: Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users." 
* commit 'b442d922a213509439dede33a1904f9da5fc244b':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
 2014-07-31 16:16:10 +00:00
Evan Charlton
b8d0717934 Fix a small typo in javadocs 
Service#START_FLAG_RETRY has an extra word; remove it.

Change-Id: I4743e2ea474c70fe5d31f1a4ef257f9752f8e823
 2014-07-31 16:14:22 +00:00
Craig Mautner
b442d922a2 am 4895bf78: Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users." 
* commit '4895bf78ffd44ba076e4bc9805e43ce834f84b1e':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
 2014-07-31 16:08:50 +00:00
Alexandra Gherghina
3be011be5a am 4b990549: am 8b0b1504: Use the appropriate default icon 
* commit '4b9905498a246c2e6429ba549ada10dcfd4f1a10':
  Use the appropriate default icon
 2014-07-31 15:50:57 +00:00
Alexandra Gherghina
c2357a6979 am 8b0b1504: Use the appropriate default icon 
* commit '8b0b1504a357ec809eed25c00923e67b4d6dad22':
  Use the appropriate default icon
 2014-07-31 15:47:05 +00:00
Alexandra Gherghina
a709314537 Use the appropriate default icon 
ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.

Bug: 16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
 2014-07-31 15:43:11 +00:00
Jorim Jaggi
3b465d99db am 6b9c14cd: am b0376562: Fix a few StatusBarHeaderView regressions 
* commit '6b9c14cda3014f399e45394d2e99a4c1d411b217':
  Fix a few StatusBarHeaderView regressions
 2014-07-31 15:31:28 +00:00
Christoph Studer
f0c233a5d9 am 2edbe5ac: am dd63df29: Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev 
* commit '2edbe5acad11815d322e16b682d4112f35ad4ce0':
  NoMan: Use Notification.isGroupX() methods
 2014-07-31 15:31:24 +00:00
Jorim Jaggi
6d8917cc65 am b0376562: Fix a few StatusBarHeaderView regressions 
* commit 'b03765626443629220dc0fe33398a1785eaaeefe':
  Fix a few StatusBarHeaderView regressions
 2014-07-31 15:28:03 +00:00
Christoph Studer
648c03b77c am dd63df29: Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev 
* commit 'dd63df2961408f35182b9fab98e51eb5f8c26184':
  NoMan: Use Notification.isGroupX() methods
 2014-07-31 15:27:58 +00:00
Jorim Jaggi
9d8ca0f010 Fix a few StatusBarHeaderView regressions 
Change-Id: Iae1af96f80caf4978c5a6ec6ef81b83543e9fe0e
 2014-07-31 15:24:43 +00:00
Christoph Studer
1f1b0ba037 am 6f6dc602: am daef7cc7: Merge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev 
* commit '6f6dc6026ae19a43201efa18ff84eaa6d68fd35c':
  SysUI: Respect "no notifs on lockscreen" setting
 2014-07-31 14:59:40 +00:00
Christoph Studer
f31e1cef54 am daef7cc7: Merge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev 
* commit 'daef7cc7cfa0c721f9419b42704b08762fcf01d3':
  SysUI: Respect "no notifs on lockscreen" setting
 2014-07-31 14:55:58 +00:00
Jorim Jaggi
f19fc3a6da am 7d06201c: am d1429923: Implement nice QS expansion transition in Keyguard 
* commit '7d06201ca1b8c3757b1ec211cbba6d3ff2868362':
  Implement nice QS expansion transition in Keyguard
 2014-07-31 14:29:00 +00:00
Jorim Jaggi
8758f21762 am e2a96c03: am decb0b1e: Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev 
* commit 'e2a96c030e88c93cfcdf85d5f56d82084416ac2c':
  Factor out keyguard components of StatusBarHeaderView
 2014-07-31 14:28:56 +00:00
Christoph Studer
e14e232fff am d06301eb: am cab1943e: Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev 
* commit 'd06301eb08300d7f9b25c4167eb3b45d2bfbeecb':
  NoMan: Filter group children for pre-L listeners
 2014-07-31 14:28:51 +00:00
Narayan Kamath
be41805a51 am 9b90ab03: am aa1cf141: Merge "Switch TextUtils over to new ICU API." into lmp-dev 
* commit '9b90ab03ab608fcf4cbbbbad673ff2519937fb03':
  Switch TextUtils over to new ICU API.
 2014-07-31 14:28:44 +00:00
Lorenzo Colitti
e0949acafb am 0acef547: am 35474389: Merge "Add logging of Legacy Type info." into lmp-dev 
* commit '0acef5477e6eee29fc61153d9c6ca2caa50252cd':
  Add logging of Legacy Type info.
 2014-07-31 14:28:40 +00:00
Jorim Jaggi
8950ca17d8 am d1429923: Implement nice QS expansion transition in Keyguard 
* commit 'd142992377e854f327b376726d94bf5789c8317b':
  Implement nice QS expansion transition in Keyguard
 2014-07-31 13:53:35 +00:00
Jorim Jaggi
6a09d01e0f am decb0b1e: Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev 
* commit 'decb0b1e788fde607db04e728b9e6dd0e3a9fb66':
  Factor out keyguard components of StatusBarHeaderView
 2014-07-31 13:49:30 +00:00
Jorim Jaggi
61d37f6d1c Implement nice QS expansion transition in Keyguard 
Bug: 16010455
Bug: 15192264
Change-Id: I764652e73ea8e87ad12b9241e038bff843a0a221
 2014-07-31 13:48:43 +00:00
Christoph Studer
e123d70d7f am cab1943e: Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev 
* commit 'cab1943ecd5e6360045112e330778223e218e006':
  NoMan: Filter group children for pre-L listeners
 2014-07-31 13:44:09 +00:00
Neil Fuller
364fe22ecb Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 2014-07-31 13:30:12 +00:00
Alexandra Gherghina
9f69eaf271 am 71fcd191: am 790bcf78: Upload new icons from ux 
* commit '71fcd1915b6b179fa47cff0d2aec3a8bed78b6e4':
  Upload new icons from ux
 2014-07-31 13:28:38 +00:00
Sander Alewijnse
f0cb383bad am 1d7e62b7: am 9d032110: Fix deadlock window manager and device policy manager. 
* commit '1d7e62b7b77fb5184feb6676669b0d2544baecd0':
  Fix deadlock window manager and device policy manager.
 2014-07-31 13:28:34 +00:00
Jae Seo
1e7100a6e6 am 6d682881: am b3e54101: TIF: Make TvTrackInfo methods more explicit. 
* commit '6d682881c2692c3566e1ab12727f7432aa8eca5e':
  TIF: Make TvTrackInfo methods more explicit.
 2014-07-31 13:28:30 +00:00
Deepanshu Gupta
3c216cc804 am c399a637: am 82bf0cf3: Merge "Fix classpath for AndroidLocale" into lmp-dev 
* commit 'c399a637bd4f934adb8d9282de32c4a76127e9a7':
  Fix classpath for AndroidLocale
 2014-07-31 13:28:25 +00:00
Dan Sandler
6000359997 am 4d8aefee: am ed3a7e7c: Merge "Fix docs build." into lmp-dev 
* commit '4d8aefeea106d6866e33bfeaf8691e791764fde3':
  Fix docs build.
 2014-07-31 13:28:21 +00:00
Wonsik Kim
ac5e7245b7 am b5c60c46: am 4092e720: Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev 
* commit 'b5c60c467ef0dfcab27b5aa9169c37a467fe603b':
  TIF: fix TvInputHal bug for multiple devices
 2014-07-31 13:28:16 +00:00
Lajos Molnar
1a4989212c am 7153c321: am a4ec1c74: MediaCodec: clean up image/buffer caching 
* commit '7153c321852e097602162bde5ea873302796ad86':
  MediaCodec: clean up image/buffer caching
 2014-07-31 13:27:59 +00:00
Youngsang Cho
e0e0ab3c4c am 7bb0a573: am bfd63283: Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev 
* commit '7bb0a573f354fcbddf9324b57facffede8af6e1c':
  TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input
 2014-07-31 13:27:55 +00:00
Narayan Kamath
3be0ba5fcc am 39b16dd7: am bd855367: Merge "Don\'t assume languages are 2 letter codes." 
* commit '39b16dd793ba73f6f11f087b06d1bf3703cc271e':
  Don't assume languages are 2 letter codes.
 2014-07-31 13:27:35 +00:00