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

196717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
eb9c86131e am 024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev 
* commit '024bce82292786f9b71da488f06a0bb35d029bbf':
  Support loading AES keys with authorized digests.
 2015-07-07 19:05:00 +00:00
Andrew Solovay
da2b00acfa am a5c82a6b: am 4357181d: am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions 
* commit 'a5c82a6b2adfbad7ac9009fa6feba3e02dad0c04':
  docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
 2015-07-07 18:56:15 +00:00
Chris Craik
268ad521b3 am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev 
* commit '6ef57e974144e05e83ee1bd00f705f0f409f48b3':
  Don't update DisplayLists when dumping
 2015-07-07 18:56:11 +00:00
Alex Klyubin
024bce8229 Merge "Support loading AES keys with authorized digests." into mnc-dev 2015-07-07 18:54:33 +00:00
Andrew Solovay
a5c82a6b2a am 4357181d: am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions 
* commit '4357181d236bf189ea7855755803275160447423':
  docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
 2015-07-07 18:46:05 +00:00
Chris Craik
6ef57e9741 Merge "Don't update DisplayLists when dumping" into mnc-dev 2015-07-07 18:42:15 +00:00
Andrew Solovay
4357181d23 am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions 
* commit 'e44b86b23bc15ccf2016e044bfa5d23c177a1d3b':
  docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
 2015-07-07 18:29:08 +00:00
xin He
39f92a9355 am 053b407b: Merge "wifi: Fix softAP turn-ON issue in statically loaded driver" into mnc-dev 
* commit '053b407b7487fef3f6e71019c1fbe36ef7a4de50':
  wifi: Fix softAP turn-ON issue in statically loaded driver
 2015-07-07 18:28:42 +00:00
xin He
053b407b74 Merge "wifi: Fix softAP turn-ON issue in statically loaded driver" into mnc-dev 2015-07-07 18:13:58 +00:00
Andrew Solovay
e44b86b23b docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions 
Per communication from Ben, READ_EXTERNAL_STORAGE was incorrectly
marked as a 'normal' permission in preview 1, and is properly
changed to 'dangerous' for preview 2. Updating the docs accordingly.

See first comment for doc stage location.

Change-Id: I0f824fb9689d2e7323e505b0200fda23eaa71eed
 2015-07-07 10:57:55 -07:00
Chris Craik
356b5fe086 Don't update DisplayLists when dumping 
bug:22234438

Updating the displaylist is invalid since this debug method isn't
called on the UI thread, and it defeats the purpose of seeing what
the hierarchy is currently rendering.

Change-Id: I10c5cc6dbae8d304559dfc6e863b0ede158d554f
 2015-07-07 10:39:39 -07:00
Ian Pedowitz
13c2a4f53d am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
* commit '937edac8e8583023019b625dd426ebf65169e30d':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
 2015-07-07 15:57:16 +00:00
Jason Monk
87b86a2d54 am 46c272d6: Merge "Don\'t dismiss volume during animation" into mnc-dev 
* commit '46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba':
  Don't dismiss volume during animation
 2015-07-07 15:50:06 +00:00
Jason Monk
9dc0cc0056 am f18ed45f: Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev 
* commit 'f18ed45faf24fdc45ce7c158d46d8ab25d39a6e3':
  Fix to work statusbar configs as mcc/mnc
 2015-07-07 15:50:02 +00:00
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
Ian Pedowitz
937edac8e8 Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" 
This reverts commit d6b404c72d.

This CL seems to have broken the build, causing GMSCore to continuously
crash.

Bug: 22313634
Bug: 22312938
Bug: 22314605
Bug: 22308392
Bug: 22307889
 2015-07-07 08:32:44 -07:00
Jason Monk
46c272d6bf Merge "Don't dismiss volume during animation" into mnc-dev 2015-07-07 14:34:59 +00:00
Jason Monk
f18ed45faf Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev 2015-07-07 14:34:47 +00:00
John Reck
15b64099a4 Merge "Adjust for pipeline stalls" into mnc-dev 2015-07-07 14:08:49 +00:00
Sungmin Choi
6be4f6b18d Fix to work statusbar configs as mcc/mnc 
Call handleConfigurationChanged() at the end of
PhoneStatusBar#onConfigurationChanged to update statusbar configs.

BUG: 22215928
Change-Id: I7329d4949a8a47717ea037cf007ef0baa63507bd
 2015-07-07 09:35:36 -04: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