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

147460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Flynn
08fae3c562 Fix some sync adapter docs typos. 
Change-Id: I7b5d314ef313326a2016ddfaa04ab9b8d8445788
 2014-08-01 14:19:48 -04:00
Ken Wakasa
f0f3172013 am 8d3eb916: resolved conflicts for merge of d13b8822 to lmp-dev-plus-aosp 
* commit '8d3eb9161c63c317d901087a740ec24f58df0413':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
 2014-08-01 13:33:34 +00:00
Wonsik Kim
7cd42da6cf Fix NPE when fused geofence hardware is not available. 
b/16690237

manual cherry pick to make master bootable, since automerger does not seem to be working

Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
(cherry picked from commit cb92d507167fcce059c4ae91dc46b496f49b4fa3)
 2014-08-01 06:45:12 +00:00
Ken Wakasa
eaf0f3d1fc resolved conflicts for merge of d13b8822 to lmp-dev-plus-aosp 
Change-Id: I3f474f72ee12684cfda7b394d7aa659c7f456131
 2014-08-01 14:55:58 +09:00
John Reck
bd38d43383 am ea13947a: am a4c5ddf6: (-s ours) am 8c57cead: Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​." 
* commit 'ea13947a3efcca425b5f42a737fd9095ab4b2f74':
  [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
 2014-07-31 22:39:57 +00:00
John Reck
6049a8a753 am a4c5ddf6: (-s ours) am 8c57cead: Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​." 
* commit 'a4c5ddf6e6bac37a6e5b14818db06102fd6b87be':
  [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
 2014-07-31 22:28:52 +00:00
John Reck
a4c5ddf6e6 am 8c57cead: Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​." 
* commit '8c57cead83105ce273351024bfa745c979f9dc48':
  [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
 2014-07-31 18:32:45 +00:00
riddle_hsu
74f37188f2 am 573fd34d: am 8e1cac41: am d66d006f: [ActivityManager] Prevent coredump file may not complete for testing. 
* commit '573fd34d1a1dc85c5ee452e539d70b1088705f9c':
  [ActivityManager] Prevent coredump file may not complete for testing.
 2014-07-31 17:36:09 +00:00
Raph Levien
31d7ece55f am eabe3ea0: am 36176c3c: am 6d624fe2: Merge "Re-remove AndroidEmoji.ttf." into lmp-dev 
* commit 'eabe3ea0e05450fa6642470ac6765fa59636248a':
  Re-remove AndroidEmoji.ttf.
 2014-07-31 17:36:05 +00:00
George Mount
66ecd02018 am 5f5b80a5: am ced4e24b: am 4b71e7f7: Merge "Fix visibility propagation check." into lmp-dev 
* commit '5f5b80a5b39b18c7eb1d5979d6419b8183ccaf7f':
  Fix visibility propagation check.
 2014-07-31 17:35:55 +00:00
riddle_hsu
7c0adcde8a am 57b1d0f0: am ac050e9e: am 5b94ec47: [ActivityManager] Avoid mistaking visibility by finishing task. 
* commit '57b1d0f09c4c1176e2be84a5ac53db2911789468':
  [ActivityManager] Avoid mistaking visibility by finishing task.
 2014-07-31 17:35:49 +00:00
Eunae Kim
76880870ba am 218a0666: Fix a bug that the RecentTask list of other’s may show up to non-primary users. 
* commit '218a0666a5235bc76f2950684bbfcb500e89972c':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
 2014-07-31 17:33:41 +00:00
destradaa
065b0e7c0f am b47ae9e6: am 13fcdab4: am 7efb7d49: Fix crash in Volantis because there is not FLP support. 
* commit 'b47ae9e6ce8f984325ba0e03bce54b7d9e6b819b':
  Fix crash in Volantis because there is not FLP support.
 2014-07-31 17:31:30 +00:00
Roozbeh Pournader
0513145475 am 3c0bbf72: am 1ef9f363: am cac26f40: Crunch Roboto and fix its digits to have the same width. 
* commit '3c0bbf72517584426199d9b3c7ad1d1b7bb8117d':
  Crunch Roboto and fix its digits to have the same width.
 2014-07-31 17:31:22 +00:00
riddle_hsu
08d1078eda am 8e1cac41: am d66d006f: [ActivityManager] Prevent coredump file may not complete for testing. 
* commit '8e1cac4180bf29e02aece94a720dfe32f762cd7d':
  [ActivityManager] Prevent coredump file may not complete for testing.
 2014-07-31 17:30:01 +00:00
Raph Levien
151ffb2be4 am 36176c3c: am 6d624fe2: Merge "Re-remove AndroidEmoji.ttf." into lmp-dev 
* commit '36176c3c0cc2d13a7de02e1b22522f9343d2ea2d':
  Re-remove AndroidEmoji.ttf.
 2014-07-31 17:29:57 +00:00
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
Eunae Kim
ad3aa32fee Fix a bug that the RecentTask list of other’s may show up to non-primary users. 
Cherry-pick from aosp to lmp-dev.

When switching to a newly created user, the user may face this bug
when he opens the RecentTask screen.

A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old
information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information
in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
 2014-07-31 10:27:28 -07:00
riddle_hsu
635e039a62 am d66d006f: [ActivityManager] Prevent coredump file may not complete for testing. 
* commit 'd66d006f9f64a0c9e70827b27e21210192f9b552':
  [ActivityManager] Prevent coredump file may not complete for testing.
 2014-07-31 17:26:08 +00:00
Raph Levien
341c63172d am 6d624fe2: Merge "Re-remove AndroidEmoji.ttf." into lmp-dev 
* commit '6d624fe23709f4e5d8643a4a9324cb327e142ee1':
  Re-remove AndroidEmoji.ttf.
 2014-07-31 17:26:04 +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
214be42ea6 [ActivityManager] Prevent coredump file may not complete for testing. 
Cherry-pick from aosp to lmp-dev

Sympton:
During testing, skip kill native crash process manually because it
will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash
process will be killed immediately that results incomplete coredump
file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
 2014-07-31 10:18:59 -07: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
Mike Lockwood
754ab11eac am 049e6df3: am 6871e3bc: am 72dff5d5: Add toString() methods to some audio classes to help with debugging. 
* commit '049e6df39fc628dbd5b8c10b0632389d76af40fb':
  Add toString() methods to some audio classes to help with debugging.
 2014-07-31 17:06:45 +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
Sandeep Siddhartha
04337db201 am 9076e16d: am 2120e854: am 9428457f: Merge "Don\'t unload sound model in start recognition unless the model changes" into lmp-dev 
* commit '9076e16de2033576d0c36b2e9b0501420c752b83':
  Don't unload sound model in start recognition unless the model changes
 2014-07-31 16:56:23 +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
2e5fbbe867 am ef1a64ec: am 7fedbd06: am 0e097002: Fix a small typo in javadocs 
* commit 'ef1a64ec49ce6a28f87179ca863ecac337288df7':
  Fix a small typo in javadocs
 2014-07-31 16:28:19 +00:00
Craig Mautner
e0990324d2 am 21dc3ff7: am b442d922: am 4895bf78: Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users." 
* commit '21dc3ff79673ffb651a242c300ee8c9fffcde358':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
 2014-07-31 16:22:42 +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
3d92d12151 am fdf33a8b: am 4b990549: am 8b0b1504: Use the appropriate default icon 
* commit 'fdf33a8b803683887240b7d4ef6e614bc77ddc79':
  Use the appropriate default icon
 2014-07-31 15:55:32 +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
15460d11ef am d7ed2057: am 6b9c14cd: am b0376562: Fix a few StatusBarHeaderView regressions 
* commit 'd7ed2057251f04895537d69e11750794f29501da':
  Fix a few StatusBarHeaderView regressions
 2014-07-31 15:35:13 +00:00