Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,019 Commits 3 Branches 0 Tags
3f32ef550e218dbdaeeed551af9db46ab4544aa0
Commit Graph

133019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
3f32ef550e am 668885a4: Merge "Add Session API calls to RCC and AudioManager" 
* commit '668885a41af63ed7a889e7fb2fa939f5ce3150c6':
  Add Session API calls to RCC and AudioManager
 2014-05-01 17:20:26 +00:00
RoboErik
fd803f0bb1 am 2e7a9f75: Merge "Add dump to MediaSessionService" 
* commit '2e7a9f75eb1276feb02e506e7379ee472754ac2e':
  Add dump to MediaSessionService
 2014-05-01 17:15:49 +00:00
RoboErik
6e6a6e863d Merge "Add Session API calls to RCC and AudioManager" 2014-05-01 17:14:56 +00:00
RoboErik
f1372428f2 Add Session API calls to RCC and AudioManager 
This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.

Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
 2014-05-01 17:14:01 +00:00
RoboErik
67e2196d07 Merge "Add dump to MediaSessionService" 2014-05-01 17:11:34 +00:00
Baligh Uddin
3141618a6e am 81814fef: (-s ours) am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '81814fefc3e0fdb5ab1d96186c53e146ed1f1d56':
  Import translations. DO NOT MERGE
 2014-05-01 16:31:29 +00:00
Baligh Uddin
4a26164316 am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1ffec559d04618fbd31eaf972a81c6df324965c1':
  Import translations. DO NOT MERGE
 2014-05-01 16:25:29 +00:00
Baligh Uddin
35120cf13d am f3e19d02: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'f3e19d024236cc5d71b29dc02092aec6a7052f3a':
  Import translations. DO NOT MERGE
 2014-05-01 16:23:14 +00:00
Baligh Uddin
0e63b71c4e am 545fe064: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '545fe0643743310c61fcbf00f49145fa5fa47dd2':
  Import translations. DO NOT MERGE
 2014-05-01 16:23:11 +00:00
Baligh Uddin
71180120b6 am 46b74854: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '46b74854a9587c356a1f4a1942e1ab8610f31af8':
  Import translations. DO NOT MERGE
 2014-05-01 16:23:07 +00:00
Baligh Uddin
1ffec559d0 am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bf4927ee0d085fd0c7eaf1221f709811f3be6f4f':
  Import translations. DO NOT MERGE
 2014-05-01 16:21:50 +00:00
Baligh Uddin
bf4927ee0d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-01 16:18:21 +00:00
Baligh Uddin
4fb660cb6a Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:18 +00:00
Baligh Uddin
fc08b6008f Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:12 +00:00
Baligh Uddin
0d5bebb35d Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:06 +00:00
Robert Ly
e2e472a7d3 am 933b1a8b: am f8df90fd: am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '933b1a8b346aed95738872b1bf4fd7fa39e0958d':
  docs: fix method name
 2014-05-01 16:09:54 +00:00
Robert Ly
3f99436761 am f8df90fd: am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit 'f8df90fd6a4afffd9ff51a91df55e3a6fd62f67c':
  docs: fix method name
 2014-05-01 16:06:05 +00:00
Selim Cinek
4259771cbc am abba15b5: Merge "Fixed several bugs regarding the state of the notifications" 
* commit 'abba15b5787ce986d3b453f63f87b71881854bea':
  Fixed several bugs regarding the state of the notifications
 2014-05-01 16:05:29 +00:00
Robert Ly
f8df90fd6a am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '007fad0dbd3f8bd3a8b7323a4587eab954093f27':
  docs: fix method name
 2014-05-01 16:02:16 +00:00
Selim Cinek
f75c7b6b98 Merge "Fixed several bugs regarding the state of the notifications" 2014-05-01 16:01:50 +00:00
Robert Ly
007fad0dbd am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
  docs: fix method name
 2014-05-01 15:56:58 +00:00
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