Ian Pedowitz
8d027e6d52
am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
...
* commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
Show the ResolverActivity in dock mode
2015-08-29 00:31:29 +00:00
Selim Cinek
554d9edf6d
am 1517c365: am 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
...
* commit '1517c365aaf0d0248072f8292d5318dd4b7a80fe':
Added animation for trusted to fingerprint error
2015-08-29 00:22:26 +00:00
Ian Pedowitz
3c227bf241
Merge "Show the ResolverActivity in dock mode" into mnc-dev
2015-08-29 00:20:27 +00:00
Deepanshu Gupta
4845fa72c2
am b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev
...
* commit 'b8ae187932ff783711ea8715d7f5891d9e4ebb32':
Fix android:theme parsing for custom views.
2015-08-29 00:02:26 +00:00
Deepanshu Gupta
b8ae187932
Merge "Fix android:theme parsing for custom views." into mnc-ub-dev
2015-08-28 23:50:00 +00:00
Christopher Wiley
6dea7ba05c
am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces"
...
* commit '4f8653c3715631d7b8d3b1e3ea600b6b1755addc':
Do not merge namespaces
2015-08-28 23:45:55 +00:00
Vadim Tryshev
c708b2b0df
Merge "Small cleanups around indexOfChild usage."
2015-08-28 23:45:15 +00:00
Vadim Tryshev
6b6b9d6879
Small cleanups around indexOfChild usage.
...
Bug: 20024603
Change-Id: I56e478c1b65b5a112a486141406f29f8acd7bb9d
2015-08-28 16:43:49 -07:00
Selim Cinek
1517c365aa
am 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
...
* commit '38ba43a45e5c9c9e82d07bd35c06a32cde9b234d':
Added animation for trusted to fingerprint error
2015-08-28 23:36:04 +00:00
Selim Cinek
38ba43a45e
am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
...
* commit '60337b6bd73bcf208c89c1d5ac6ff50d51c0700f':
Added animation for trusted to fingerprint error
2015-08-28 23:28:30 +00:00
Jorim Jaggi
af99873c07
am 27912dfd: am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks
...
* commit '27912dfd866f2631803a35c1ec47b6f31f8d2054':
Fix race condition by guarding callbacks
2015-08-28 23:25:51 +00:00
Christopher Wiley
4f8653c371
am 3fc6f441: (-s ours) Merge "Do not merge namespaces"
...
* commit '3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a':
Do not merge namespaces
2015-08-28 23:19:02 +00:00
Selim Cinek
60337b6bd7
am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
...
* commit 'e774bdd6f09a65886429a2d84a6af7e4b6352280':
Added animation for trusted to fingerprint error
2015-08-28 23:17:50 +00:00
Jorim Jaggi
27912dfd86
am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks
...
* commit 'e6b0282a8440f77adc310ddcbef5e191d31ef6af':
Fix race condition by guarding callbacks
2015-08-28 23:13:30 +00:00
Christopher Wiley
3fc6f441ac
Merge "Do not merge namespaces"
2015-08-28 23:09:50 +00:00
Selim Cinek
e774bdd6f0
Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
2015-08-28 23:09:19 +00:00
Jorim Jaggi
e6b0282a84
am a2681383: am acace94c: Fix race condition by guarding callbacks
...
* commit 'a26813838015072999bf7f8c83b0be2dd5e1430b':
Fix race condition by guarding callbacks
2015-08-28 23:02:04 +00:00
Jorim Jaggi
a268138380
am acace94c: Fix race condition by guarding callbacks
...
* commit 'acace94c1739b08ea72dc6c2f49cf29bce6c1dac':
Fix race condition by guarding callbacks
2015-08-28 22:49:16 +00:00
Todd Kennedy
1a35015719
Tweak systrace calls
...
Tracing needed a few tweaks.
First, add overall tracing for all of the incoming methods that cause a
package to go through the install flow -- installPackageAsUser, installStage
and movePackage.
Second, add a few more traces for things such as dexopt.
Third, adjust some of the calls; avoid using the async trace methods
when they're not necessary, etc...
Change-Id: Iff47189ddad4478d9fbc6eac2f7031e54cba6271
2015-08-28 15:19:38 -07:00
Ruben Brunk
847370ce61
am 7ba74bf2: am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
...
* commit '7ba74bf2600d3227521c4a1a61197df4a48cc805':
Fix DngCreator default crop calculations.
2015-08-28 22:16:11 +00:00
Robert Greenwalt
06eeda6b38
am 8096be27: am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit '8096be27323b26ae177255381366823c8448e3c5':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 22:16:02 +00:00
Jorim Jaggi
acace94c17
Fix race condition by guarding callbacks
...
Bug: 23587553
Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742
2015-08-28 22:08:03 +00:00
Ruben Brunk
7ba74bf260
am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
...
* commit 'e65066d30eb52d2ef938501890ba4cf99d8f1b7b':
Fix DngCreator default crop calculations.
2015-08-28 22:05:46 +00:00
Robert Greenwalt
8096be2732
am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit 'fbb28f5552fe42453ebaf48fc11a7c07a5c9bd8b':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 22:05:38 +00:00
Ruben Brunk
e65066d30e
am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
...
* commit '7a193899c9b5f7911b6fdb7db27f91c441a63ed3':
Fix DngCreator default crop calculations.
2015-08-28 21:55:40 +00:00
Robert Greenwalt
fbb28f5552
am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit '77d02900d8ab287f8dcecabda44766e15dbfad4f':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 21:55:33 +00:00
Deepanshu Gupta
753517700d
Fix android:theme parsing for custom views.
...
Change-Id: Iba83ba1d2e4a96461cc298a759e32e4e51e311a0
2015-08-28 14:49:04 -07:00
Ruben Brunk
7a193899c9
am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
...
* commit '96990d0cdd7f7757ba16b927766854e0dc6fa994':
Fix DngCreator default crop calculations.
2015-08-28 21:47:24 +00:00
Robert Greenwalt
77d02900d8
am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 21:47:20 +00:00
Fyodor Kupolov
3f1099b062
Merge "Non-system users can now have restricted profiles"
2015-08-28 21:44:54 +00:00
Ruben Brunk
96990d0cdd
Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
2015-08-28 21:42:26 +00:00
Robert Greenwalt
5799f42806
am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 21:36:39 +00:00
Robert Greenwalt
e3bcde94ca
Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
2015-08-28 21:27:22 +00:00
destradaa
b902698632
Clean up Gps/Flp Hardware on shut-down.
...
Ensures that the GPS and FLP HAL interfaces are deinitialized upon
system shut-down. This gives a chance for the underlying HAL to
close cleanly any resources it could be holding.
Note this approach only works for a device's power-off, scenarios
such as adb shell stop / start cannot be handled, because in such
cases the process is terminated sending SIGKILL to it.
Bug: 23279835
Bug: 23279593
Change-Id: I29b3306c0ae2b384d0542031080a15fdbe49dd71
2015-08-28 14:03:26 -07:00
Jorim Jaggi
762320e7d1
am f757bed7: am 7b933895: am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw
...
* commit 'f757bed7f7fa72528ab2d7225139d9d6f3b1021a':
Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:48:51 +00:00
Jorim Jaggi
f757bed7f7
am 7b933895: am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw
...
* commit '7b933895481813425358bcfe56e0c1afa902a6d2':
Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:37:52 +00:00
Chris Tate
05a24e5b59
am a6888d6d: am b5bcd607: am 27c5cfd7: am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev
...
* commit 'a6888d6d8b912a69fad189e1d53da79746aa74ae':
Crashing the system process is inadvisable
2015-08-28 20:37:24 +00:00
Chong Zhang
3c2d1fd84b
am 7c8eb2b9: am 52e6d458: am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev
...
* commit '7c8eb2b9df3c0820c02421ab5ff3b11150bb9f12':
Fix deadlock when updating rotation
2015-08-28 20:37:16 +00:00
Xiaohui Chen
86c69ddefd
Cleanup USER_OWNER for cryptkeeper
...
Bug: 19913735
Change-Id: I1105081aa2cb97d20afbd1e38d65c18c94e37a40
2015-08-28 20:35:12 +00:00
Chris Tate
a6888d6d8b
am b5bcd607: am 27c5cfd7: am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev
...
* commit 'b5bcd6077a9fc72867a2a23c1a5465ae04b13e03':
Crashing the system process is inadvisable
2015-08-28 20:30:10 +00:00
Chong Zhang
7c8eb2b9df
am 52e6d458: am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev
...
* commit '52e6d458d6cf0af7bda45cb80262af6fc369799f':
Fix deadlock when updating rotation
2015-08-28 20:30:04 +00:00
Jorim Jaggi
7b93389548
am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw
...
* commit 'e3238e53ded59d360447d94f4d52d3b20de906c2':
Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:27:35 +00:00
Jorim Jaggi
e3238e53de
am b774e554: Optimize fp touch to wake: Shortcut for report next draw
...
* commit 'b774e554f32fd65cac30b43d1cf679403ef4af82':
Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:19:31 +00:00
Chris Tate
b5bcd6077a
am 27c5cfd7: am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev
...
* commit '27c5cfd727a413eee0f981cb23c97d2375600610':
Crashing the system process is inadvisable
2015-08-28 20:19:13 +00:00
Chong Zhang
52e6d458d6
am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev
...
* commit '430778bd75a735324b4ea7447a19268fe09e00e8':
Fix deadlock when updating rotation
2015-08-28 20:19:04 +00:00
Jeff Sharkey
3f4c298248
am 0551d5d9: am ac4fd070: am 90023609: am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev
...
* commit '0551d5d9ee2888779e9c37c9a509451ef65ef981':
Give shell permission to move apps.
2015-08-28 20:18:39 +00:00
Jorim Jaggi
b774e554f3
Optimize fp touch to wake: Shortcut for report next draw
...
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
2015-08-28 20:07:35 +00:00
Chris Tate
27c5cfd727
am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev
...
* commit '9b2f9bcb56765c52a2fc9cdcdcf11c6707403210':
Crashing the system process is inadvisable
2015-08-28 20:06:49 +00:00
Jeff Sharkey
0551d5d9ee
am ac4fd070: am 90023609: am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev
...
* commit 'ac4fd0702e04be88b5aa7b539cf38195abd343c5':
Give shell permission to move apps.
2015-08-28 20:06:45 +00:00
Chong Zhang
430778bd75
am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev
...
* commit '482635e34d0def1682ebc644db0636862994f649':
Fix deadlock when updating rotation
2015-08-28 20:06:44 +00:00