summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt"Narayan Kamath2014-11-261-14/+16
|\ | | | | | | | | * commit 'edda97c9ffc4fae08744e42fdbf60040e8f97b99': Start MountService before performBootDexOpt
| * am fdbef408: Merge "Start MountService before performBootDexOpt"Narayan Kamath2014-11-261-14/+16
| |\ | | | | | | | | | | | | * commit 'fdbef4081d715de59525d58d44881b00f616616f': Start MountService before performBootDexOpt
| | * Merge "Start MountService before performBootDexOpt"Narayan Kamath2014-11-261-14/+16
| | |\
| | | * Start MountService before performBootDexOptpadarshr2014-11-181-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is to start Mountservice before starting performBootDexOpt, as in one case, in performBootDexOpt when system upgrade happens, StorageManager will be started to get the low threshold of DataDir. But, at this point, as Mountservice is still not up, StorageManager will end up having a null object of Mountservice. Change-Id: I6dec474266faa5de67449c1bbe6ef30791e5ecaa
* | | | am bf62d307: am af5bd75b: Merge "Enable stencil clipping within ↵Chris Craik2014-11-261-7/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | clearLayerRegions" * commit 'bf62d3070c1653b79f4edcc0729b6a1a833d3ca1': Enable stencil clipping within clearLayerRegions
| * | | am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"Chris Craik2014-11-261-7/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'af5bd75b3d65fc710784f59d1c22c164312e2691': Enable stencil clipping within clearLayerRegions
| | * | Merge "Enable stencil clipping within clearLayerRegions"Chris Craik2014-11-251-7/+1
| | |\ \
| | | * | Enable stencil clipping within clearLayerRegionsDohyun Lee2014-11-241-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously stencil clipping within clearLayerRegions is disabled by commit 62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer regions causes black-colored triangle regions when a TextView has RotateAnimation because the draw within clearLayerRegions does not affected by the current stencil clip. Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2 Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
* | | | | am f67cc149: am 2657717f: Merge "We have POSIX clocks."Elliott Hughes2014-11-251-14/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f67cc149982cefdcf9f8697c9966c710f6512d23': We have POSIX clocks.
| * | | | am 2657717f: Merge "We have POSIX clocks."Elliott Hughes2014-11-251-14/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2657717f97e0de689aa3d8cae75bb0053607839d': We have POSIX clocks.
| | * | | Merge "We have POSIX clocks."Elliott Hughes2014-11-251-14/+0
| | |\ \ \
| | | * | | We have POSIX clocks.Elliott Hughes2014-11-251-14/+0
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
* | | | | am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, ↵chh2014-11-2510-20/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | don\'t warn about unused parameters" * commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4': Remove unused variables and functions, don't warn about unused parameters
| * | | | am fc545733: Merge "Remove unused variables and functions, don\'t warn about ↵chh2014-11-2510-20/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | unused parameters" * commit 'fc54573373ff965aa40cccdc1ab11c1c880c8930': Remove unused variables and functions, don't warn about unused parameters
| | * | | Merge "Remove unused variables and functions, don't warn about unused ↵chh2014-11-2510-20/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | parameters"
| | | * | | Remove unused variables and functions, don't warn about unused parametersBernhard Rosenkränzer2014-11-2310-20/+5
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variables and static functions clang complains about, disable warnings about unused parameters (needed for clang and for gcc with -Wextra enabled) Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-254-6/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '43ea037b4c61e332d7419ac069a62e314166fdd7': Fix class vs. struct mismatch
| * | | | am 481c4b64: Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-254-6/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '481c4b641ea7d210396f16478c486cabf51db879': Fix class vs. struct mismatch
| | * | | Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-254-6/+7
| | |\ \ \
| | | * | | Fix class vs. struct mismatchBernhard Rosenkränzer2014-11-244-6/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't refer to classes as structs and view versa -- causes warnings in clang (in code built with -Werror) Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 6cc39a47: am 613d2066: Merge "Fix unused variables."Chih-hung Hsieh2014-11-254-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '6cc39a475dd8eaac04438b393559612ff7cd840f': Fix unused variables.
| * | | | am 613d2066: Merge "Fix unused variables."Chih-hung Hsieh2014-11-254-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '613d20668a28f9dc970949c9efd2ca7f61bed6f4': Fix unused variables.
| | * | | Merge "Fix unused variables."Chih-hung Hsieh2014-11-244-0/+4
| | |\ \ \
| | | * | | Fix unused variables.Bernhard Rosenkränzer2014-11-244-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return value of jniRegisterNativeMethods is checked only in LOG_FATAL_IF, which defines to nothing in the LOG_NDEBUG case. Fake a use of the 'res' variable to shut off warnings when LOG_NDEBUG. Change-Id: I8263610f327c56897f76796fe1fbc2b325b0559f Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 73780ac3: am 38cc84de: Merge "Remove unused variable"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '73780ac3921c26853eb132296144b85461c80e31': Remove unused variable
| * | | | am 38cc84de: Merge "Remove unused variable"Chih-hung Hsieh2014-11-241-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '38cc84deceaf7bc9fab898cbcb37523cfba2bb66': Remove unused variable
| | * | | Merge "Remove unused variable"Chih-hung Hsieh2014-11-241-1/+1
| | |\ \ \
| | | * | | Remove unused variableBernhard Rosenkränzer2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variable clang complains about Change-Id: I05ef90f45dbed0f51dace9c65a941f948fe579e7 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am a3b1ea33: am e57b3991: Merge "Remove unused function"Chih-Hung Hsieh2014-11-251-8/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a3b1ea33368b72209f72ad21b512b1c755ce05aa': Remove unused function
| * | | | | am e57b3991: Merge "Remove unused function"Chih-Hung Hsieh2014-11-241-8/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'e57b3991d85f22597014d74b64805a081cc978e0': Remove unused function
| | * | | | Merge "Remove unused function"Chih-Hung Hsieh2014-11-241-8/+0
| | |\ \ \ \
| | | * | | | Remove unused functionChih-Hung Hsieh2014-11-241-8/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an unused static function clang complains about Change-Id: Id5875960e9f93348c7a3a912f42b5f457af2cdc0 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am 83f4847f: am 59093d92: Merge "Define permission for system apps to query ↵Andres Morales2014-11-252-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of block" into lmp-mr1-dev * commit '83f4847f7b842fafec74fad85878e36b19dfef9f': Define permission for system apps to query size of block
| * \ \ \ \ \ am 59093d92: Merge "Define permission for system apps to query size of ↵Andres Morales2014-11-252-1/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block" into lmp-mr1-dev * commit '59093d925decaf6ddf2e952de25e3cdd1b492d81': Define permission for system apps to query size of block
| | * \ \ \ \ \ Merge "Define permission for system apps to query size of block" into ↵Andres Morales2014-11-252-1/+10
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | Define permission for system apps to query size of blockAndres Morales2014-11-252-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows ManagedProvisioning to determine whether there's a challenge and thus whether to disable NFC provisioning. Other implementation option: new hidden boolean API method. Can't think of benefit of new API method "isBlockInUse", other than doesn't leak PDB size and is more explicitly tied to the use case. Open to either impl if anyone has opinions on the matter. Bug: 18508767 Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
* | | | | | | | | am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when ↵Bo Liu2014-11-251-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvasHandle is NULL" into lmp-mr1-dev * commit '3813430367591efcf925b2baebc50a99a7666644': Fix crash in getNativeCanvas when canvasHandle is NULL
| * | | | | | | | am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" ↵Bo Liu2014-11-251-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '84be180e97f920a9400789368a6bc54c5a9b90d8': Fix crash in getNativeCanvas when canvasHandle is NULL
| | * | | | | | | Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-devBo Liu2014-11-251-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix crash in getNativeCanvas when canvasHandle is NULLBo Liu2014-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18261928 Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
* | | | | | | | | | am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on ↵John Reck2014-11-255-75/+35
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DrawableContainer creates a new state"" into lmp-mr1-dev * commit 'f2a382d4f7de5336d0c20358bb694e205a38fc38': Revert "Ensure calling mutate() on DrawableContainer creates a new state"
| * | | | | | | | | am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer ↵John Reck2014-11-255-75/+35
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creates a new state"" into lmp-mr1-dev * commit 'fb6121e069f25dd43e15b1377fe4d5f60c3d0dbe': Revert "Ensure calling mutate() on DrawableContainer creates a new state"
| | * | | | | | | | Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new ↵John Reck2014-11-255-75/+35
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state"" into lmp-mr1-dev
| | | * | | | | | | | Revert "Ensure calling mutate() on DrawableContainer creates a new state"John Reck2014-11-255-75/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d7dab349c2af0e4bde188b1969f0c697b217dd57. Change-Id: Icc1c4bfa296a59a551088fe7cc2449a97bb2b7b7 Reason: Broke the build
* | | | | | | | | | | am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to ↵John Reck2014-11-254-32/+30
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkPixelRef::fStableId" into lmp-mr1-dev * commit '89a63f02f5d0814435e72b515b792bc6737014dc': Switch TextureCache to SkPixelRef::fStableId
| * | | | | | | | | | am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into ↵John Reck2014-11-254-32/+30
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '0c31d97a38909e85e0df6cdc29469dbb1580ed4b': Switch TextureCache to SkPixelRef::fStableId
| | * | | | | | | | | Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-devJohn Reck2014-11-254-32/+30
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Switch TextureCache to SkPixelRef::fStableIdJohn Reck2014-11-244-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18245805 Change-Id: I08e6792dbeed86b13e569c7f2137de0e50dc2763
* | | | | | | | | | | | am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge ↵Natalie Masse2014-11-251-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs * commit 'a05d4a4bb38df792cbf19a0f1e198a26f1509281': Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
| * | | | | | | | | | | am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed ↵Natalie Masse2014-11-251-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs * commit '8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd': Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
generated by cgit v1.1 at 2025-02-19 05:55:16 +0000