Svetoslav
047ab3b2e5
am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
...
* commit 'cf0a337352a228302d44f9582673c7acdba329ca':
Use default encryption password if an accessibility service is enabled.
2014-10-01 17:10:00 +00:00
Winson Chung
07f9306ef4
am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
...
* commit '69a0645eb2025c54232c4b65544db581a183c1e7':
Fixing regression with black task bar background. (Bug 17584337)
2014-10-01 17:09:51 +00:00
Chris Wren
5055589269
am edc19979: am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev
...
* commit 'edc199796844db9ee947165ddfff7cec810403e2':
Add a returns clause to the matchesInterruptionFilter javadoc.
2014-10-01 17:09:47 +00:00
Chris Wren
8bac9b5a6e
am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
...
* commit 'ca20e6c637c34a1200f08b2de5485193bc4eb74c':
Update the documentation on EXTRA_PEOPLE.
2014-10-01 17:09:43 +00:00
Dianne Hackborn
63f38a0836
am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755 : Battery stats resets at incorrect times" into lmp-dev
...
* commit 'e83f322fa91f64844ea24aab2944540ca43a2a01':
Fix issue #17705755 : Battery stats resets at incorrect times
2014-10-01 17:09:29 +00:00
George Mount
c416fb8c62
am 8cc88125: am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
...
* commit '8cc881257c6e8e9448a05e25688861536ea55971':
Clear preordered list after use.
2014-10-01 17:09:09 +00:00
Svetoslav
344ffbc647
am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
...
* commit '567c97881b1d1719d32daaf647979e47e01be438':
Use default encryption password if an accessibility service is enabled.
2014-10-01 15:15:03 +00:00
Winson Chung
d1c1201dfc
am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
...
* commit 'b61dea2047b1b27f169728104f8279528fbd9eac':
Fixing regression with black task bar background. (Bug 17584337)
2014-10-01 15:14:56 +00:00
Chris Wren
82ef988c92
am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev
...
* commit 'b742c9a01261075d6a85f23d72e7842dec932cda':
Add a returns clause to the matchesInterruptionFilter javadoc.
2014-10-01 15:14:52 +00:00
Chris Wren
1d88c087e6
am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
...
* commit '4afe428f49533342966545a14b51acaee9052c71':
Update the documentation on EXTRA_PEOPLE.
2014-10-01 15:14:49 +00:00
Dianne Hackborn
30854356ef
am 29a11523: am c3014c8c: Merge "Fix issue #17705755 : Battery stats resets at incorrect times" into lmp-dev
...
* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
Fix issue #17705755 : Battery stats resets at incorrect times
2014-10-01 15:14:38 +00:00
George Mount
6d7a0cd57f
am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
...
* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
Clear preordered list after use.
2014-10-01 15:14:22 +00:00
Svetoslav
567c97881b
am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
...
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
Use default encryption password if an accessibility service is enabled.
2014-10-01 15:00:44 +00:00
Winson Chung
b61dea2047
am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
...
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
Fixing regression with black task bar background. (Bug 17584337)
2014-10-01 15:00:17 +00:00
Chris Wren
b742c9a012
am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev
...
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
Add a returns clause to the matchesInterruptionFilter javadoc.
2014-10-01 14:59:59 +00:00
Chris Wren
4afe428f49
am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
...
* commit 'af098c5657942d645ec7362cc439718457abec64':
Update the documentation on EXTRA_PEOPLE.
2014-10-01 14:59:55 +00:00
Dianne Hackborn
29a1152358
am c3014c8c: Merge "Fix issue #17705755 : Battery stats resets at incorrect times" into lmp-dev
...
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
Fix issue #17705755 : Battery stats resets at incorrect times
2014-10-01 14:59:18 +00:00
George Mount
3dc0a91874
am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
...
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
Clear preordered list after use.
2014-10-01 14:58:53 +00:00
Dianne Hackborn
f9cd6fa5a3
am bb527c59: am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit 'bb527c59d1fb0ad627f44cbb378959fa7d4af2c7':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 01:42:37 +00:00
Dianne Hackborn
e26ba8f74f
am 069de204: am 38646c19: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 00:58:52 +00:00
Dianne Hackborn
069de2045e
am 38646c19: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 00:51:10 +00:00
Svetoslav
44d4eeaa48
Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
2014-09-30 20:01:04 +00:00
Svetoslav
16e4a1aade
Use default encryption password if an accessibility service is enabled.
...
When device is encrypted the user has to authenticate in order to decrypt
the data partition which is required for running accessibility services
and Text-To-Speech. In order to address this issue we are falling back
to use the default password if there is an enabled accessibility service
and the user has secure lock. This will enable the user to authenticate
when accessibility layer is completely functional.
bug:17671790
Change-Id: Iafffe7bcd234008cf91ffb5011b21b803dca227a
2014-09-30 13:00:11 -07:00
Winson Chung
da649073bd
Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
2014-09-30 19:16:22 +00:00
Chris Wren
c3328cacda
Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev
2014-09-30 18:51:28 +00:00
Chris Wren
af098c5657
Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
2014-09-30 18:50:05 +00:00
Chris Wren
0fef44de68
Add a returns clause to the matchesInterruptionFilter javadoc.
...
Bug: 17641219
Change-Id: I4f1949902bf872823389f3db8e694e370e113295
2014-09-30 13:05:14 -04:00
Dianne Hackborn
c3014c8cf8
Merge "Fix issue #17705755 : Battery stats resets at incorrect times" into lmp-dev
2014-09-30 16:45:26 +00:00
Adrian Roos
442f7913ab
am a0ce5e72: am 04cea9f8: am 0c92c858: am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev
...
* commit 'a0ce5e72ebf286b62f825d2a90e3dc4a19583438':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
2014-09-30 16:11:40 +00:00
Paul Jensen
1bf1ef5ae9
am 52786d9b: am 5aa788a6: am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony.
...
* commit '52786d9bc115b7cd37335c1f408fdf68e784ac41':
Move mobile provisioning APN support into telephony.
2014-09-30 16:11:23 +00:00
Chris Wren
e6c4893ed4
Update the documentation on EXTRA_PEOPLE.
...
Include the supported formats with links to ContactsContract documentation.
Bug: 15283556
Change-Id: Ic48b0a9ad1be61f0fa119b1d0e9d6aac5e5bea27
2014-09-30 11:57:03 -04:00
George Mount
8afceda141
Merge "Clear preordered list after use." into lmp-dev
2014-09-30 14:58:21 +00:00
George Mount
c5ac3546dc
am 3cc3fbf3: am 2d0d041f: am 3bcfbdd9: am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.
...
* commit '3cc3fbf3aa090919506b1ef726b54fa18fc5e72a':
Order GhostViews so that they display in their ghosted view's order.
2014-09-30 14:57:23 +00:00
Svetoslav
31677f947f
am 6b0394fb: am 77e41f5e: am b009016f: am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
...
* commit '6b0394fb958b86f2ef9372c20511950c634524d0':
Accessibility node provider getting invalid virtual view id.
2014-09-30 14:57:10 +00:00
Dianne Hackborn
fb3809ca63
Fix issue #17705755 : Battery stats resets at incorrect times
...
Revert back to (mostly) KK behavior, fix a problem where we were
collecting some data in an inconsistent state.
Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02
2014-09-29 18:31:22 -07:00
George Mount
50ac6cb982
Clear preordered list after use.
...
Bug 17671834
Bug 17697944
Change-Id: I0ba46f32661869db0c925b00342211ea543e2f88
2014-09-29 17:10:24 -07:00
Dianne Hackborn
73d6a821ae
Work on issue #17656716 : Unhandled exception in Window Manager
...
Remove the checks for large parcel sizes. Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.
Add logging for strict mode IPCs, since those seem to be the
problem. Only log when things look bad.
Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.
Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
2014-09-29 16:04:02 -07:00
Winson Chung
ae12dae13a
Fixing regression with black task bar background. (Bug 17584337)
...
Change-Id: Ieaa2defa4997ffc8851832c18dfe84e561ffedb5
2014-09-29 15:05:00 -07:00
Adrian Roos
04cea9f8e0
am 0c92c858: am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev
...
* commit '0c92c858b039a40b066136cdbf13ae5a38a00b1d':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
2014-09-29 21:01:37 +00:00
Paul Jensen
5aa788a61f
am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony.
...
* commit 'a621a97f4a05891a514ba5343c9db04d125e1eb8':
Move mobile provisioning APN support into telephony.
2014-09-29 21:01:08 +00:00
Adrian Roos
0c92c858b0
am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev
...
* commit '51a400eb440c89fb06a47371bb7b026f00edb09c':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
2014-09-29 20:48:00 +00:00
Paul Jensen
a621a97f4a
am 89e0f093: Move mobile provisioning APN support into telephony.
...
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
Move mobile provisioning APN support into telephony.
2014-09-29 20:47:32 +00:00
Adrian Roos
9d38f35a8f
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
...
By default, dreams should not get the in-window bars
because those conflict with the lights-out bar mode.
Bug: 17367264
Change-Id: I8c041c706f7a7c4791ed4760c34a5618fb7423d7
2014-09-29 15:48:46 +02:00
Paul Jensen
89e0f0937a
Move mobile provisioning APN support into telephony.
...
Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.
bug:17324098
Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
2014-09-29 11:37:43 +00:00
jgu21
454a681fc3
am df44f764: am 20867871: Frameworks/base: Early init native bridge
...
* commit 'df44f764444a8676051c54cfb3e3f5fd2b8682c8':
Frameworks/base: Early init native bridge
2014-09-29 04:20:28 +00:00
George Mount
2d0d041ffe
am 3bcfbdd9: am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.
...
* commit '3bcfbdd9024785af3bbf8a0f6c513b36ea1b7ae9':
Order GhostViews so that they display in their ghosted view's order.
2014-09-29 04:17:40 +00:00
Svetoslav
77e41f5ec4
am b009016f: am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
...
* commit 'b009016f03f893129b3b20592ba8cae4bd1c9747':
Accessibility node provider getting invalid virtual view id.
2014-09-29 04:17:18 +00:00
jgu21
df44f76444
am 20867871: Frameworks/base: Early init native bridge
...
* commit '208678718f9f8db3bc279c7d5bd1445af2831ae3':
Frameworks/base: Early init native bridge
2014-09-29 03:37:34 +00:00
George Mount
3bcfbdd902
am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.
...
* commit '8120652bb1155d762d945c1a3bf1636b6825dbd2':
Order GhostViews so that they display in their ghosted view's order.
2014-09-29 02:55:37 +00:00
Svetoslav
b009016f03
am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
...
* commit 'ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40':
Accessibility node provider getting invalid virtual view id.
2014-09-29 02:55:07 +00:00