summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into ↵Adam Lesinski2015-08-313-48/+6
|\ | | | | | | | | | | | | mnc-dr-dev * commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95': BatteryStats: Start using cpu power from kernel
| * Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-devAdam Lesinski2015-08-313-48/+6
| |\
| | * BatteryStats: Start using cpu power from kernelAdam Lesinski2015-08-213-48/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to stop using approximate methods of attributing cpu frequency time across apps and to use a more precise kernel method that is aware of the time spent by a process on a given core at a given frequency. Bug:22773176 Change-Id: I3c34365fa8c73204f178a5610423901b13453d06
* | | am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down ↵Svetoslav Ganov2015-08-311-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | instrumentation" into mnc-dev * commit '144c4ff08a0be40e6b8af1bca269b33557923d71': Fix a NPE when shutting down instrumentation
| * | am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-devSvetoslav Ganov2015-08-311-2/+4
| |\ \ | | | | | | | | | | | | | | | | * commit '4cb113ed72b771d3148c00a025eb8bc949ff6a41': Fix a NPE when shutting down instrumentation
| | * \ Merge "Fix a NPE when shutting down instrumentation" into mnc-devSvetoslav Ganov2015-08-311-2/+4
| | |\ \
| | | * | Fix a NPE when shutting down instrumentationSvet Ganov2015-08-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23657953 Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
* | | | | Merge "Add capability for a connection hand rejection text response." into ↵Bryce Lee2015-08-314-2/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | cw-e-dev
| * | | | | Add capability for a connection hand rejection text response.Bryce Lee2015-08-284-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id90417736bed7ab8750144ccaf3c7b449ec832b8
* | | | | | am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into ↵Pavel Zhamaitsiak2015-08-291-0/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'd9efca994f99523288986f29128d696440ee4150': Support uneditable enhanced 4g lte mode config
| * | | | | Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-devPavel Zhamaitsiak2015-08-291-0/+7
| |\ \ \ \ \
| | * | | | | Support uneditable enhanced 4g lte mode configSungmin Choi2015-08-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23539759 Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5
* | | | | | | am 469fa946: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '469fa946132b34165ea014e2eef7cd94f59171c1': Import translations. DO NOT MERGE
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921 Auto-generated-cl: translation import
* | | | | | | am 3656975e: Merge "Run callbacks from fingerprintd through handler." into ↵Jim Miller2015-08-291-31/+62
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '3656975ef879175aa81cf6362a6a7ffc4a5a99fc': Run callbacks from fingerprintd through handler.
| * | | | | | Merge "Run callbacks from fingerprintd through handler." into mnc-dr-devJim Miller2015-08-291-31/+62
| |\ \ \ \ \ \
| | * | | | | | Run callbacks from fingerprintd through handler.Jim Miller2015-08-291-31/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a potential race condition on the client monitors where an async event from fingerprintd could change the state and disrupt communication with the clients. Fixes bug 23633702 Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
* | | | | | | | am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" ↵Ian Pedowitz2015-08-291-6/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d': Show the ResolverActivity in dock mode
| * | | | | | | am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-devIan Pedowitz2015-08-291-6/+8
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07': Show the ResolverActivity in dock mode
| | * | | | | | Merge "Show the ResolverActivity in dock mode" into mnc-devIan Pedowitz2015-08-291-6/+8
| | |\ \ \ \ \ \
| | | * | | | | | Show the ResolverActivity in dock modeChristopher Tate2015-08-271-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are multiple dock apps present the end result should be the disambiguation UI, not a fast-forward to the 'normal' home app. Bug 23501598 Change-Id: Iebc106b136cb1e446d1e93935738335504f5b812
* | | | | | | | | am e774bdd6: Merge "Added animation for trusted to fingerprint error" into ↵Selim Cinek2015-08-2834-5/+1472
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'e774bdd6f09a65886429a2d84a6af7e4b6352280': Added animation for trusted to fingerprint error
| * | | | | | | | Merge "Added animation for trusted to fingerprint error" into mnc-dr-devSelim Cinek2015-08-2834-5/+1472
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Added animation for trusted to fingerprint errorSelim Cinek2015-08-2834-5/+1472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21781452 Change-Id: Ib3b229c9ebece926a68a0c6a69341d0f68166698
* | | | | | | | | | am acace94c: Fix race condition by guarding callbacksJorim Jaggi2015-08-281-10/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'acace94c1739b08ea72dc6c2f49cf29bce6c1dac': Fix race condition by guarding callbacks
| * | | | | | | | | Fix race condition by guarding callbacksJorim Jaggi2015-08-281-10/+18
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23587553 Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742
* | | | | | | | | am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-devRuben Brunk2015-08-281-32/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96990d0cdd7f7757ba16b927766854e0dc6fa994': Fix DngCreator default crop calculations.
| * | | | | | | | Merge "Fix DngCreator default crop calculations." into mnc-dr-devRuben Brunk2015-08-281-32/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix DngCreator default crop calculations.Ruben Brunk2015-08-281-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23591407 Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
* | | | | | | | | | am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-devRobert Greenwalt2015-08-281-4/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5799f428063cec8f0b85cdff41185e0725b19b74': Reduce CONNECTIVITY_CHANGE bcasts
| * | | | | | | | | am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-devRobert Greenwalt2015-08-281-4/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691': Reduce CONNECTIVITY_CHANGE bcasts
| | * | | | | | | | Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-devRobert Greenwalt2015-08-281-4/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Reduce CONNECTIVITY_CHANGE bcastsRobert Greenwalt2015-08-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app uses the new api (requestNetwork) to bring up MMS, don't mark it as a legacy request. This was done because the messaging service had to use a combination of new API and old (requestRouteToHost) due to api problems. This has been resolved so don't mark these as legacy requests anymore. The general stuff is still in for other types due to lack of testing time but this should be removed altogether in the future. bug:23350688 Change-Id: I41c27efb253c39d8af1357ae7916ed5315c716db
* | | | | | | | | | | am b774e554: Optimize fp touch to wake: Shortcut for report next drawJorim Jaggi2015-08-283-3/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b774e554f32fd65cac30b43d1cf679403ef4af82': Optimize fp touch to wake: Shortcut for report next draw
| * | | | | | | | | | Optimize fp touch to wake: Shortcut for report next drawJorim Jaggi2015-08-283-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When telling window manager that Keyguard window is in the correct state for a fp-touch-to-wake sequence, it takes more than 1 frame at the moment because the signal that WM is waiting for the next draw is delayed by one frame because it is posted at the end of the runnable queue. To correctly fix this, we should post it at the beginning at the queue, but this is way too risky this late. Instead, add a isolated SysUI hack to report it faster. Bug: 23401557 Change-Id: Icf64101e27611c7c01d108123021b22186f1e70c
* | | | | | | | | | | am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" ↵Chris Tate2015-08-281-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '9b2f9bcb56765c52a2fc9cdcdcf11c6707403210': Crashing the system process is inadvisable
| * | | | | | | | | | am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-devChris Tate2015-08-281-4/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82d14d60e7a772ecf45b637fd51a2335ad2a40cf': Crashing the system process is inadvisable
| | * | | | | | | | | Merge "Crashing the system process is inadvisable" into mnc-devChris Tate2015-08-281-4/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Crashing the system process is inadvisableChristopher Tate2015-08-281-4/+6
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When asking for the set of services published by a package, it's quite possible that there are none, in which case the returned List<> is null rather than valid-but-empty. Don't bother looking at it when it's null. Bug 23614440 Change-Id: Ibebb26b9c3f75ec810a95f1b9d2663e884cb98bc
* | | | | | | | | | | am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-devChong Zhang2015-08-281-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '482635e34d0def1682ebc644db0636862994f649': Fix deadlock when updating rotation
| * | | | | | | | | | Merge "Fix deadlock when updating rotation" into mnc-dr-devChong Zhang2015-08-281-1/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix deadlock when updating rotationChong Zhang2015-08-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post a runnable in MyOrientationListener.onProposedRotationChanged for the updateRotation() so that it doesn't acquire WM lock while holding WindowOrientationListener lock. It could cause deadlock if WM is is performing a relayout and try to access WindowOrientationListener. bug: 23507268 Change-Id: I5775f5a13cae0283fef64877801bf8a39dfc90a4
* | | | | | | | | | | | am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into ↵Jeff Sharkey2015-08-282-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '71f1579190ee3658db15f55a4e5571f03ce431b6': Give shell permission to move apps.
| * | | | | | | | | | am d88152b4: Merge "Give shell permission to move apps." into mnc-devJeff Sharkey2015-08-282-3/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd88152b4d910fa5e79908dcb6f14cd56ad03b21a': Give shell permission to move apps.
| | * | | | | | | | | Merge "Give shell permission to move apps." into mnc-devJeff Sharkey2015-08-282-3/+9
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Give shell permission to move apps.Jeff Sharkey2015-08-282-3/+9
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clear identity when measuring ASEC sizes to relax a second permission requirement. Bug: 23600574 Change-Id: Ib3a104426758e0e8f35dff0e504fe874bed7311f
* | | | | | | | | | | am 8b403e8c: am 3ab2e664: Merge "Docs: Localized DAC landing pages for M ↵David Friedman2015-08-2828-203/+2706
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview, updated for Dev Prev 3." into mnc-dev * commit '8b403e8cb1bc6bfa2e9ba627f5c48d1a0bc65738': Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.
| * | | | | | | | | | am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated ↵David Friedman2015-08-2828-203/+2706
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Dev Prev 3." into mnc-dev * commit '3ab2e66424d6e8faabd4342da21f488f7e3bfdb5': Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.
| | * | | | | | | | | Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev ↵David Friedman2015-08-2828-203/+2706
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3." into mnc-dev
| | | * | | | | | | | | Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.David Friedman2015-08-2728-203/+2706
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I031bfbec9673699ef3f8680612b67dcb143882e7
generated by cgit v1.1 at 2025-01-27 12:33:40 +0000