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

133468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
10285c6a92 am 8bb3003f: Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 
* commit '8bb3003fca6a678fb3df524ed6779dc9210fca86':
  Revert "Temporarily switch off returning only enabled profiles to support dogfooding"
 2014-05-01 15:53:54 +00:00
Marco Nelissen
9421ba17da am ce7268e0: am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ce7268e0ae210ef44361d931c7f0ce9737c09e9c':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:53:50 +00:00
Robert Ly
6b7f3936ed am b39ce1b6: docs: fix method name 
* commit 'b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
  docs: fix method name
 2014-05-01 15:53:03 +00:00
Robert Ly
b39ce1b6c1 docs: fix method name 
Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc
 2014-05-01 08:47:14 -07:00
Alexandra Gherghina
973a1d2741 Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 2014-05-01 15:42:07 +00:00
Selim Cinek
4a1ac84e35 Fixed several bugs regarding the state of the notifications 
Fixed an issue where the last card was hidden even though there would
have been enough space to show it when it was expanded.
Also fixed an issue where the first card was not expandable when it was
the only one.
In addition the scroll range was corrected, to ensure that the last card
could always be scrolled to full visibility, which was not the case
previously when the last card was expanded.

Bug: 14376035
Change-Id: I372a55dc1fc6e381dd9aef3d631447912e3d1024
 2014-05-01 17:41:47 +02:00
Marco Nelissen
ae84e20b2a am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:35:31 +00:00
Marco Nelissen
4375e84882 am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:32:17 +00:00
Marco Nelissen
ab962b54e3 am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:28:14 +00:00
Marco Nelissen
ab3977d211 Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 2014-05-01 15:25:13 +00:00
Narayan Kamath
6445caeee1 am 9a3e54e7: am 53138105: am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null." 
* commit '9a3e54e73e25507472e8eabca0dd30c30011c5db':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-05-01 14:54:07 +00:00
Narayan Kamath
27bda7c23f am 1cb9322a: am d6809b35: am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic." 
* commit '1cb9322a289286d200de2686d979373b5ab97dfd':
  Fix dex file pruning logic.
 2014-05-01 14:53:58 +00:00
Narayan Kamath
26c285df05 am cd99b824: am fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps." 
* commit 'cd99b8246065e92d6c7987b937abd213a9b525d5':
  Adjust instruction sets for shared UID apps.
 2014-05-01 14:53:55 +00:00
Narayan Kamath
2c4e44b374 am 53138105: am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null." 
* commit '531381056fac077cffcd509b1e89d9b41f400fca':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-05-01 14:51:04 +00:00
Narayan Kamath
576cfd96a7 am d6809b35: am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic." 
* commit 'd6809b35aff02fdccf7ac433005aba2d06bbc3ff':
  Fix dex file pruning logic.
 2014-05-01 14:51:00 +00:00
Narayan Kamath
c98ca4c326 am fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps." 
* commit 'fbd80b58db2aa8f650acf26305e8cbed24a5755b':
  Adjust instruction sets for shared UID apps.
 2014-05-01 14:50:57 +00:00
Narayan Kamath
3020f83e1c am 921b2f1e: am 3a951e52: (-s ours) resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp 
* commit '921b2f1e248603c49123f5fb325a215eea768c81':
  Package manager changes for dual zygote stack.
 2014-05-01 14:49:44 +00:00
George Mount
e9755a3fba am fa509392: Merge "Fixed transition start delay propagation when duration = 0." 
* commit 'fa50939227fc4f1c032229b63291ddb0447e3f9c':
  Fixed transition start delay propagation when duration = 0.
 2014-05-01 14:49:41 +00:00
Narayan Kamath
71b3467a8a am 3a951e52: (-s ours) resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp 
* commit '3a951e52d93697b7e232501b78f9ffb0ec605516':
  Package manager changes for dual zygote stack.
 2014-05-01 14:44:38 +00:00
George Mount
794853f61c Merge "Fixed transition start delay propagation when duration = 0." 2014-05-01 14:44:03 +00:00
Narayan Kamath
86a38d235a am afbbbfc0: Fix build. 
* commit 'afbbbfc01a1c00f304b5bbae3406afcdc4ed5185':
  Fix build.
 2014-05-01 14:41:42 +00:00
Narayan Kamath
531381056f am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null." 
* commit '5dca099df7100c531e111b50435605c318f1e6d4':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-05-01 14:39:20 +00:00
Narayan Kamath
d6809b35af am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic." 
* commit 'c1f81f9086037dde6e082b8a80c84277cb727726':
  Fix dex file pruning logic.
 2014-05-01 14:39:16 +00:00
Narayan Kamath
fbd80b58db am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps." 
* commit '51f4367cac606580a5ca10ec1cf2dcab3982aebc':
  Adjust instruction sets for shared UID apps.
 2014-05-01 14:39:12 +00:00
Narayan Kamath
4948f0eee8 Fix build. 
Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16
 2014-05-01 15:37:15 +01:00
Narayan Kamath
cde266020a am dc9d4b4b: am d2ec8724: am d85ded89: am 645a920f: Merge "Fix OEM native library path bug." 
* commit 'dc9d4b4bcafd64b0e70123f0c50781a8888221bf':
  Fix OEM native library path bug.
 2014-05-01 14:35:59 +00:00
Narayan Kamath
b5a3660039 am c24badd9: am f5c6a1b3: am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating" 
* commit 'c24badd9c0ad7420d6abe3ae6c714537abaae3e1':
  Fix native-lib dir assignment & updating
 2014-05-01 14:35:56 +00:00
Narayan Kamath
dab02bfce0 am f7b93a9b: am 0338af46: (-s ours) am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well" 
* commit 'f7b93a9b7c01a364436a46b0b9389f4be0d89e5a':
  Handle /oem and /vendor as well
 2014-05-01 14:35:46 +00:00
Narayan Kamath
3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp 
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
 2014-05-01 15:32:20 +01:00
Narayan Kamath
6442494046 am d2ec8724: am d85ded89: am 645a920f: Merge "Fix OEM native library path bug." 
* commit 'd2ec8724d2a3407e28161299d44e2e113fe437ec':
  Fix OEM native library path bug.
 2014-05-01 14:31:12 +00:00
Narayan Kamath
3009d40c1a am f5c6a1b3: am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating" 
* commit 'f5c6a1b3eb10f0374fcbab55853f400778f0f8e7':
  Fix native-lib dir assignment & updating
 2014-05-01 14:31:07 +00:00
Narayan Kamath
a4a1c34525 am 0338af46: (-s ours) am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well" 
* commit '0338af46f968e2e1c2fd8c62e9387546fa9ed86b':
  Handle /oem and /vendor as well
 2014-05-01 14:31:02 +00:00
George Mount
3d3e681bac am 7056c7e7: Merge "Fix "blink" when going "back" quickly after entering Activity." 
* commit '7056c7e7f4393cc80b450b38e327524db95832f6':
  Fix "blink" when going "back" quickly after entering Activity.
 2014-05-01 14:18:22 +00:00
George Mount
8df5a07d88 Merge "Fix "blink" when going "back" quickly after entering Activity." 2014-05-01 14:13:01 +00:00
George Mount
265f209d55 Fixed transition start delay propagation when duration = 0. 
Bug 14443184

Also gave the propagation speed a tweak to make it more
obvious that there is a propagation.

Change-Id: If9dc3172ae6ce7e6a712ccd1b83ebec9bf880bfa
 2014-05-01 07:11:52 -07:00
Narayan Kamath
c77783675e am 5d2b38a4: am 5bc12a1b: (-s ours) am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps" 
* commit '5d2b38a4a569c8bcd6abcbdeb45207bd16d66879':
  Support per-package lib dirs for bundled apps
 2014-05-01 14:10:29 +00:00
Narayan Kamath
9ad2380c9d am 5bc12a1b: (-s ours) am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps" 
* commit '5bc12a1b5dadfd504fb03875fad97cda8d39cf25':
  Support per-package lib dirs for bundled apps
 2014-05-01 14:06:37 +00:00
Narayan Kamath
da3595252b am eceea503: am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit 'eceea503c02075921516653c770483d987d9f36f':
  Implement FileUtils#contains.
 2014-05-01 14:04:37 +00:00
Narayan Kamath
d2ec8724d2 am d85ded89: am 645a920f: Merge "Fix OEM native library path bug." 
* commit 'd85ded890d86d454a0571c63911ff911633e3a95':
  Fix OEM native library path bug.
 2014-05-01 14:01:14 +00:00
Narayan Kamath
f5c6a1b3eb am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating" 
* commit 'eb5734989b3ef5455359f8807684a860ad04c134':
  Fix native-lib dir assignment & updating
 2014-05-01 14:01:10 +00:00
Narayan Kamath
5dca099df7 am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null." 
* commit '1cec7f8539e6465ff80577169d7d07df3c2574b7':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-05-01 14:00:52 +00:00
Narayan Kamath
c1f81f9086 am 27f2bfc4: Merge "Fix dex file pruning logic." 
* commit '27f2bfc406157039c5241f6a4f38f597b2076e2a':
  Fix dex file pruning logic.
 2014-05-01 14:00:49 +00:00
Narayan Kamath
51f4367cac am bcc3b312: Merge "Adjust instruction sets for shared UID apps." 
* commit 'bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
  Adjust instruction sets for shared UID apps.
 2014-05-01 14:00:46 +00:00
Narayan Kamath
69da8a124e am 2a9a0471: Merge "Package manager changes for dual zygote stack." 
* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
  Package manager changes for dual zygote stack.
 2014-05-01 14:00:43 +00:00
Narayan Kamath
2e2c7d2325 am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit '6af42aea725c2afd8e5fbff9bc33ba353c05e1a9':
  Implement FileUtils#contains.
 2014-05-01 14:00:25 +00:00
Narayan Kamath
0338af46f9 am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well" 
* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
  Handle /oem and /vendor as well
 2014-05-01 13:57:21 +00:00
Narayan Kamath
5bc12a1b5d am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps" 
* commit 'a7b465efc4eede46b8dfc8932c6c30346e8e79de':
  Support per-package lib dirs for bundled apps
 2014-05-01 13:57:17 +00:00
Narayan Kamath
6af42aea72 am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains." 
* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
  Implement FileUtils#contains.
 2014-05-01 13:57:13 +00:00
Narayan Kamath
1cec7f8539 Merge "Don't adjust ABI if PackageSetting#pkg is null." 2014-05-01 13:56:59 +00:00
Narayan Kamath
d85ded890d am 645a920f: Merge "Fix OEM native library path bug." 
* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
  Fix OEM native library path bug.
 2014-05-01 13:56:59 +00:00