Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,696 Commits 3 Branches 0 Tags
dfbae1f9935cdbfa8662d9437cabd5b9f6e767e0
Commit Graph

196696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
dfbae1f993 am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev 
* commit '15b64099a440a5f6256f4c51c6d9ae13a754f94d':
  Adjust for pipeline stalls
 2015-07-07 15:49:55 +00:00
Zoltan Szatmary-Ban
bf3079917a am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '41df5bfc0d50d36cb2c46d539043813bebbb1289':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 15:49:49 +00:00
Richard Coles
2bb6828839 am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev 
* commit 'fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8':
  Add WebView permission MIDI sysex
 2015-07-07 15:49:44 +00:00
Esteban Talavera
0e9ffff458 am 5a81b61e: Merge "Notify the profile when cloned settings are changed." into mnc-dev 
* commit '5a81b61e879d7f6031c28d0d89d4b785654d2a00':
  Notify the profile when cloned settings are changed.
 2015-07-07 15:49:39 +00:00
Andrei Stingaceanu
bb09a7cd09 am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 
* commit 'bc687f96c74bd164f5d030cebe80d38274ca336c':
  Drag handles persist after lost focus in extracted mode
 2015-07-07 15:49:34 +00:00
Ian Pedowitz
6d45f2793e am 5bc88b9f: Merge "Final resource IDs." into mnc-dev 
* commit '5bc88b9f46a17d6578d8f8a8b93c7c607d06e063':
  Final resource IDs.
 2015-07-07 15:48:57 +00:00
Abodunrinwa Toki
0bb0e22619 am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '4603bd34ce8a5557729e3912a081ec9f8c0d7ab5':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 15:48:48 +00:00
John Reck
15b64099a4 Merge "Adjust for pipeline stalls" into mnc-dev 2015-07-07 14:08:49 +00:00
Zoltan Szatmary-Ban
41df5bfc0d Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 2015-07-07 10:17:07 +00:00
Richard Coles
fad2e49c42 Merge "Add WebView permission MIDI sysex" into mnc-dev 2015-07-07 10:15:17 +00:00
Esteban Talavera
5a81b61e87 Merge "Notify the profile when cloned settings are changed." into mnc-dev 2015-07-07 09:27:27 +00:00
Andrei Stingaceanu
bc687f96c7 Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 2015-07-07 09:14:37 +00:00
Ian Pedowitz
5bc88b9f46 Merge "Final resource IDs." into mnc-dev 2015-07-07 06:13:14 +00:00
Abodunrinwa Toki
4603bd34ce Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into mnc-dev 2015-07-07 03:59:46 +00:00
Jan Nordqvist
3eaebfe5e9 am 2047929e: Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev 
* commit '2047929ef7c4484e81215b9146f9e435d4d33025':
  Changed config_wifi_hotspot2_enabled to false.
 2015-07-07 01:49:01 +00:00
Selim Cinek
2b0db74ad2 am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev 
* commit '4d696690e6fb4059608d239624fde255c916b8e2':
  Fixed a bug where redacted notifications had the wrong height
 2015-07-07 01:48:57 +00:00
Jan Nordqvist
2047929ef7 Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev 2015-07-07 01:41:17 +00:00
Selim Cinek
4d696690e6 Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev 2015-07-07 01:37:07 +00:00
Zhijun He
1f67e4c826 am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev 
* commit '1f52fce6b9535b0c83e703d0141f2f80a4a2ebfa':
  ImageUtils: fix image copy issue
 2015-07-07 01:16:39 +00:00
Zhijun He
1f52fce6b9 Merge "ImageUtils: fix image copy issue" into mnc-dev 2015-07-07 01:07:17 +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
Selim Cinek
d06c41c970 Fixed a bug where redacted notifications had the wrong height 
When redacted notifications were added on the lockscreen,
it's size might have been incorrect sometimes.

Bug: 22235304
Change-Id: I30f665bc8e725cdd40a20051e995b10e77f96918
 2015-07-06 16:59:27 -07: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
John Reck
be3fba05e8 Adjust for pipeline stalls 
Bug: 20853441

Calculating duration that crosses the UI-RT
sync point will now subtract out the time spent waiting
in queue under the assumption that this time will be
accounted for in the previous frame's metrics

Change-Id: Ia8213f4410638840613f5ae439e98dfb77532a6a
 2015-07-06 16:12:46 -07: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
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
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