Adam Lesinski
c6c215227f
am a5bd0e3a: am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
...
* commit 'a5bd0e3a3a61483ee27e24095461418f7d8c86df':
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
2015-07-07 00:58:11 +00:00
Billy Lau
e2835f9f5b
am 212c006e: am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
...
* commit '212c006e2aa0b8c430b09c85b70a0df4ffa37713':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-07 00:47:50 +00:00
Aravind Akella
61f398fc1c
am 8cc759a5: am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
...
* commit '8cc759a551d15a00721ebc0b672143d462b68cf0':
Remove flag mDataInjectionMode.
2015-07-07 00:47:46 +00:00
Winson Chung
45e1153d16
am ef024af4: am 2924dc34: Merge "Adding metrics to overview." into mnc-dev
...
* commit 'ef024af4207c0cb3955bbb4bd4fd994144d772e9':
Adding metrics to overview.
2015-07-07 00:47:42 +00:00
Jean-Michel Trivi
fe1b7ad0c6
am 87d3d893: am 760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev
...
* commit '87d3d8937f606e3d1aaa590f60ece99906c0aeda':
Ringtone: add support for volume control and looping
2015-07-07 00:47:38 +00:00
Adam Lesinski
a5bd0e3a3a
am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
...
* commit 'fe45b29a1cce45b47f648cbff2b7d65890f1d638':
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
2015-07-07 00:46:35 +00:00
Adam Lesinski
fe45b29a1c
Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
2015-07-07 00:32:24 +00:00
Billy Lau
212c006e2a
am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
...
* commit 'c81ecb6d2c6badb5ddbf19f7c90e350cf24322ee':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-07 00:31:53 +00:00
Aravind Akella
8cc759a551
am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
...
* commit 'adaa79d722dc1b410a3a8b083be5268cbb817ce4':
Remove flag mDataInjectionMode.
2015-07-07 00:31:47 +00:00
Winson Chung
ef024af420
am 2924dc34: Merge "Adding metrics to overview." into mnc-dev
...
* commit '2924dc346654a22f72575eb8ae3ce2e714818bd2':
Adding metrics to overview.
2015-07-07 00:31:42 +00:00
Jean-Michel Trivi
87d3d8937f
am 760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev
...
* commit '760b1409bc865df5c60f637b8c994eb20888acb8':
Ringtone: add support for volume control and looping
2015-07-07 00:31:36 +00:00
Billy Lau
c81ecb6d2c
Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
2015-07-07 00:27:33 +00:00
Aravind Akella
adaa79d722
Merge "Remove flag mDataInjectionMode." into mnc-dev
2015-07-07 00:24:04 +00:00
Winson Chung
2924dc3466
Merge "Adding metrics to overview." into mnc-dev
2015-07-07 00:17:56 +00:00
Billy Lau
d6b404c72d
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
...
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag.
Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.
Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
2015-07-07 00:27:53 +01:00
Jean-Michel Trivi
760b1409bc
Merge "Ringtone: add support for volume control and looping" into mnc-dev
2015-07-06 23:07:26 +00:00
Winson Chung
5c9f4b90bf
Adding metrics to overview.
...
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
2015-07-06 15:52:21 -07:00
Dianne Hackborn
569984f274
am d178b2da: am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
...
* commit 'd178b2da6398483ba806b9d28506c822fe8738f4':
Add easy way to get device idle whitelist.
Don't prevent windows from drawing when they are just moving
Added support for mid-call enabled SRVCC conference call
MWI,phantom call,Suppl services, error codes
Rename VoLTE/WFC enable API to available - add VT available API.
Avoid IllegalStateException when generating/importing keys.
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
Unhide signal strength constants used by getLevel.
2015-07-06 22:43:03 +00:00
Adam Lesinski
61db88fc8b
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
...
Bug:22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
2015-07-06 15:36:46 -07:00
Dianne Hackborn
d178b2da63
am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
...
* commit '5c8498db2111ea69566bc43a9e799d0447af789d':
Add easy way to get device idle whitelist.
2015-07-06 22:31:36 +00:00
Jorim Jaggi
e58857d7b1
am 28b4fc76: Merge "Don\'t prevent windows from drawing when they are just moving" into mnc-dev
...
* commit '28b4fc76e2da7b93d9ba7ba75a7d0a512d9ff140':
Don't prevent windows from drawing when they are just moving
2015-07-06 22:31:31 +00:00
Alex Klyubin
b60903cda9
am b9e13a25: Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev
...
* commit 'b9e13a25f39c53002787a89abdb599b952d96e21':
Avoid IllegalStateException when generating/importing keys.
2015-07-06 22:31:28 +00:00
David Friedman
4712c68f17
am 18b763bb: am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
...
* commit '18b763bb1ac6747754581e1c70b4f622e59cdfcc':
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
2015-07-06 22:31:24 +00:00
Casey Ho
766f3108e0
am becddea6: Merge "Unhide signal strength constants used by getLevel." into mnc-dev
...
* commit 'becddea63e2c4b414e5eac2841d3516c4e89bb24':
Unhide signal strength constants used by getLevel.
2015-07-06 22:31:16 +00:00
Dianne Hackborn
5c8498db21
Merge "Add easy way to get device idle whitelist." into mnc-dev
2015-07-06 22:24:51 +00:00
Dianne Hackborn
1b13968707
Add easy way to get device idle whitelist.
...
Change-Id: I28b0df69e7fb16b5d7542b1eae626bbfdd9a4c1c
2015-07-06 15:13:37 -07:00
Etan Cohen
1bfabc7419
Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev
...
* changes:
Added support for mid-call enabled SRVCC conference call
MWI,phantom call,Suppl services, error codes
Rename VoLTE/WFC enable API to available - add VT available API.
2015-07-06 22:10:22 +00:00
Jorim Jaggi
28b4fc76e2
Merge "Don't prevent windows from drawing when they are just moving" into mnc-dev
2015-07-06 22:07:34 +00:00
Aravind Akella
d4cc5ec230
Remove flag mDataInjectionMode.
...
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
2015-07-06 14:57:23 -07:00
Alex Klyubin
b9e13a25f3
Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev
2015-07-06 21:50:43 +00:00
David Friedman
18b763bb1a
am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
...
* commit '076d4f40d849d1d1e628fa6b210e690020d04956':
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
2015-07-06 21:41:05 +00:00
Casey Ho
becddea63e
Merge "Unhide signal strength constants used by getLevel." into mnc-dev
2015-07-06 21:39:31 +00:00
David Friedman
9b89b2972c
am 593904b1: am f9fc53bb: am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
...
* commit '593904b1abf3fc31279692d9db97664f76887298':
Docs: Clarification of language and typo fix for work merged from CL 716303.
2015-07-06 21:33:42 +00:00
David Friedman
076d4f40d8
am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
...
* commit '7bd9b634c42b500466cf416566d27da229d6ca1c':
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
2015-07-06 21:27:05 +00:00
David Friedman
593904b1ab
am f9fc53bb: am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
...
* commit 'f9fc53bb6f46ab89fb058c41d162b43ee9799314':
Docs: Clarification of language and typo fix for work merged from CL 716303.
2015-07-06 21:26:38 +00:00
David Friedman
7bd9b634c4
Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
2015-07-06 21:15:07 +00:00
David Friedman
f9fc53bb6f
am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
...
* commit '77b6971b4699bd94c9a4b044108f264f1ddfe31f':
Docs: Clarification of language and typo fix for work merged from CL 716303.
2015-07-06 21:13:19 +00:00
Jorim Jaggi
c5af4f8421
Don't prevent windows from drawing when they are just moving
...
Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
2015-07-06 21:12:49 +00:00
David Friedman
77b6971b46
am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
...
* commit 'c66c7622eadb04c1ca258725ae7125626824c324':
Docs: Clarification of language and typo fix for work merged from CL 716303.
2015-07-06 20:56:51 +00:00
Chris Craik
e29b4b11e6
am e8dab95b: am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
...
* commit 'e8dab95b1be1f51eae43a6b4dc0d1a600de2b3b6':
Clearer message when failing to draw a SW layer
2015-07-06 20:51:25 +00:00
David Friedman
1639af4240
am 766b5b74: am f3a910b8: am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
...
* commit '766b5b74c3d63c0fdb703fe87db98dbe46b722e5':
docs: M Preview 2 - release notes
2015-07-06 20:40:01 +00:00
Chris Craik
e8dab95b1b
am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
...
* commit '74fed612336fad30c8a93a346160ee36c87bd843':
Clearer message when failing to draw a SW layer
2015-07-06 20:39:15 +00:00
Chris Craik
74fed61233
Merge "Clearer message when failing to draw a SW layer" into mnc-dev
2015-07-06 20:29:57 +00:00
David Friedman
766b5b74c3
am f3a910b8: am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
...
* commit 'f3a910b88dbb5235552752d0f3492410bca0ef59':
docs: M Preview 2 - release notes
2015-07-06 20:23:45 +00:00
David Friedman
f3a910b88d
am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
...
* commit '5977c4879b166eb1b5c0d6a7a361dde515e1d502':
docs: M Preview 2 - release notes
2015-07-06 20:09:11 +00:00
David Friedman
c66c7622ea
Docs: Clarification of language and typo fix for work merged from CL 716303.
...
Change-Id: I04f062696926b00ccfbd45fef368061dd968efbb
2015-07-06 13:04:16 -07:00
David Friedman
5977c4879b
am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
...
* commit '07661e3b73cee9720d79d0d09f7a60104ce4cabc':
docs: M Preview 2 - release notes
2015-07-06 19:53:11 +00:00
Jim Miller
f711aa386c
am 6f27127b: am 79d9219c: Merge "Only allow fingerprint auth for the current user" into mnc-dev
...
* commit '6f27127b7c63422c1a805afd1adc46c7120e4046':
Only allow fingerprint auth for the current user
2015-07-06 19:40:14 +00:00
David Friedman
07661e3b73
Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
2015-07-06 19:38:09 +00:00
Jim Miller
6f27127b7c
am 79d9219c: Merge "Only allow fingerprint auth for the current user" into mnc-dev
...
* commit '79d9219c9f9734025837a01a6f8e490d1e0ab57e':
Only allow fingerprint auth for the current user
2015-07-06 19:30:36 +00:00
