drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,351 Commits 1 Branch 0 Tags
Commit Graph

205351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
71b4c04944 am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 
* commit 'f9e60801073d0d3339ba948934460b77aa5e936e':
  Added ACCESS_COARSE_LOCATION permission for BT
 2015-07-24 18:18:42 +00:00
Elliott Hughes
d149c9e59a aapt: expat exports its header files now. 
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
(cherry picked from commit 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
 2015-07-24 18:08:45 +00:00
Fyodor Kupolov
f9e6080107 am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 
* commit 'a5e25f33a530eb76c7b0fb77111eeedd6bd1f879':
  Added ACCESS_COARSE_LOCATION permission for BT
 2015-07-24 18:03:12 +00:00
Fyodor Kupolov
a5e25f33a5 Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 2015-07-24 17:54:14 +00:00
Andrei Stingaceanu
f8480f5250 am 20295341: am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev 
* commit '2029534162b308c7dcb3ef73616ecd6c98b22c64':
  Disallow dragging text in extracted mode
 2015-07-24 16:07:41 +00:00
Julia Reynolds
f6a39adb1d am e0afde9c: am ff42cce4: am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev 
* commit 'e0afde9cf959557cf0cdf76a376234ae029ad608':
  Prevent lockscreen album art from flickering on metadata change.
 2015-07-24 16:07:35 +00:00
Andrei Stingaceanu
2029534162 am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev 
* commit '31006d9243e1b40b7ba9a3ff559e1af29314c02a':
  Disallow dragging text in extracted mode
 2015-07-24 15:17:20 +00:00
Julia Reynolds
e0afde9cf9 am ff42cce4: am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev 
* commit 'ff42cce4be414e12fc0aac70b12e9f31a323d5f7':
  Prevent lockscreen album art from flickering on metadata change.
 2015-07-24 15:17:15 +00:00
Andrei Stingaceanu
31006d9243 am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev 
* commit 'afad464c1b73540941e052e33ba6ab318426ff80':
  Disallow dragging text in extracted mode
 2015-07-24 15:00:11 +00:00
Julia Reynolds
ff42cce4be am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev 
* commit 'e00ab550d2ab3fc539cf02a45f774c9bf68e585a':
  Prevent lockscreen album art from flickering on metadata change.
 2015-07-24 15:00:06 +00:00
Andrei Stingaceanu
afad464c1b am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev 
* commit '45794910031ce2a0e2df3d1694783da7e3c4352b':
  Disallow dragging text in extracted mode
 2015-07-24 14:47:48 +00:00
Julia Reynolds
e00ab550d2 am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev 
* commit 'ea00f320ee9caad53d63a3eaaee2d4733c9dca50':
  Prevent lockscreen album art from flickering on metadata change.
 2015-07-24 14:47:43 +00:00
Andrei Stingaceanu
4579491003 Merge "Disallow dragging text in extracted mode" into mnc-dev 2015-07-24 14:35:48 +00:00
Julia Reynolds
ea00f320ee Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev 2015-07-24 14:34:02 +00:00
Jim Miller
5703cd5448 am 72d9a4df: am 56e1be70: am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev 
* commit '72d9a4dfc70973f83a5d6d005dac7f83e1d5640b':
  Add FEATURE_FINGERPRINT to PackageManager's feature list
 2015-07-24 04:07:27 +00:00
Jean-Michel Trivi
78aedaf5f6 am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev 
* commit 'dc9fcc3a55e734b2aab1e4754db3b588e1fbfc80':
  MediaPlayer subtitle controller: use debug log instead of warning
 2015-07-24 04:07:18 +00:00
John Reck
0e5a5161e6 am d79117c4: am 9ba771bb: am c2db381e: am 6b66a4a8: use findProcess instead of getProcess 
* commit 'd79117c405fab2c7a64d7307a941df05a713814d':
  use findProcess instead of getProcess
 2015-07-24 04:07:12 +00:00
Amit Mahajan
ba8435cbc1 am 5ad07ce0: am b621b71c: am ae5569de: am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev 
* commit '5ad07ce0c711de053d04327d9f518163c6e0cf99':
  UICC : discard language setting of SIM
 2015-07-24 04:07:04 +00:00
Adrian Roos
86a87d27a0 am d30691e5: am caf526ef: am 9e289b05: am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev 
* commit 'd30691e577e1b0c0e91026c48d520dcbe9944bbd':
  Disable Keyguard affordances before setup is completed
 2015-07-24 04:06:58 +00:00
Svetoslav Ganov
2dd71cc165 am 74521d3a: am 7bda4b96: am 79355545: am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev 
* commit '74521d3a7ae6291cb6f32e8405b4e67a57b7c626':
  Keep default permission grants uninstalling a sys package upgrade
 2015-07-24 04:06:52 +00:00
John Reck
23861bb9d0 am 78d491ac: am 452b62e1: am c5d3dde6: am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev 
* commit '78d491ac8dbf85424e87386bedeee0016df6f7fb':
  Move updateMatrix() call to animateCommon
 2015-07-24 04:06:47 +00:00
Deepanshu Gupta
700ec4b42c am 825a6d12: am 3420d579: am 0e0d4ec9: am f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev 
* commit '825a6d12a8a5376cc3763aca5f4d32a388407c09':
  Set support flag for custom layouts for RecyclerView.
 2015-07-24 04:06:38 +00:00
Yohei Yukawa
c99ecb34f8 am c0e0b1e3: am 646f9da9: am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev 
* commit 'c0e0b1e3145bb26db2f41ac9d885c3368f2f6f75':
  Don't rely on broadcast intent for waking up input method.
 2015-07-24 04:06:31 +00:00
Deepanshu Gupta
328fd9c177 am 3983f586: am e45289f5: am f5ba5356: am 49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev 
* commit '3983f5861d39599b67be32697902f59af097abfd':
  LayoutLib: translucent sys ui bars
  Move the layout code out of RenderSessionImpl.
 2015-07-24 04:06:22 +00:00
Deepanshu Gupta
0a5bcf83f7 am 3ca27bd1: am 2df99f99: am 678aef41: am f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev 
* commit '3ca27bd17b3b82db15856a60d6dcd5d6d36d74a8':
  CalendarView rendering: use R.styleable to find attr.
 2015-07-24 04:06:15 +00:00
Tim Kilbourn
4d2c2583df am a714a4a7: am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev 
* commit 'a714a4a77020303c5ab9464781464bd050110525':
  Add a wm command to dismiss the keyguard.
 2015-07-24 04:06:09 +00:00
Svetoslav Ganov
cb731204c4 am ce4668b6: am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev 
* commit 'ce4668b6be8f66625fcea4331baf5cc8e7d6dee1':
  Reset permissions and app links when clearing app preferences - framework
 2015-07-24 04:06:03 +00:00
Svetoslav Ganov
7ddfc7b024 am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit '1c37dc8197ca0f85ae32304930ec254d0ba9911e':
  Shut down UiAutomationConnection without a lock held
 2015-07-24 04:05:56 +00:00
Tim Kilbourn
096b562ec3 am 79383d53: am 1c78d467: am 115189fd: am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev 
* commit '79383d53bc69adaebd4e195e78bf7dfe1867f03a':
  Properly synchronize interactivity state.
 2015-07-24 04:05:50 +00:00
Jason Monk
17127a3cb6 am 184044e4: am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '184044e499a36297e01ce6d3bd55b7c9026be178':
  Fix emergency only when no sims
 2015-07-24 04:05:42 +00:00
Julia Reynolds
cf533d1cf7 am 969bc9f7: am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit '969bc9f7da19cb429ca850fe6205a9a9b48e1c6d':
  Set 'the' media notification to the notification actually playing.
 2015-07-24 04:05:35 +00:00
Jorim Jaggi
48692f6e19 am dd0b42d4: am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit 'dd0b42d42dab9b0f48719d56d69f47a2e7a3f8cd':
  Make sure expandingFinished gets called when going into QS
 2015-07-24 04:05:29 +00:00
Wenchao Tong
34f055ab9f am 52dd36cb: am 1770cb41: am 25975f1b: am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev 
* commit '52dd36cb67dcc7741704147876c7efbb713dea0b':
  Ignore the active network scorer when checking for idleness
 2015-07-24 04:05:22 +00:00
John Reck
11f9da310a am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup 
* commit 'bdb2a90570b6fcdcb85d010070f77f7cea61e41a':
  Fix a race condition that could cause lockup
 2015-07-24 04:05:13 +00:00
Amith Yamasani
63af491023 am 81b5d555: am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev 
* commit '81b5d5550c7a9705b25e455b19a90eeb151a2182':
  Avoid a deadlock between PMS and AppOpsService
 2015-07-24 04:05:06 +00:00
Alex Klyubin
aec5a14e6c am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev 
* commit '6d8cf7a7a063cfa0c37ea85946c6f1fe105435c5':
  Document what algorithms Android Keystore supports.
 2015-07-24 04:04:56 +00:00
Junda Liu
5ffab5f603 am 18046b72: am e77b00ce: am e1ebca6c: am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 
* commit '18046b72698becc90ceb4ff324d878169216a295':
  Remove volte_feature_disabled as carrier config handled it.
 2015-07-24 04:04:49 +00:00
Jean-Michel Trivi
6045865d02 am 5be1cdea: am 2ea36877: am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 
* commit '5be1cdea1c3ba40edc3e85d66e86370a56726d06':
  RingtoneManager: query results depend on caller permission
 2015-07-24 04:04:41 +00:00
Jack Yu
1643493e97 am de978817: am e0dc2394: am 8ac962a7: am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev 
* commit 'de97881796d7062a577ee0397c802d3825c65d4d':
  Allow carriers to force disable ETWS/CMAS test messages.
 2015-07-24 04:04:31 +00:00
Geoff Mendal
689ddb04f6 am 06cec5f5: (-s ours) am c5246d9f: (-s ours) am 22a824fe: (-s ours) am 13edc160: (-s ours) Import translations. DO NOT MERGE 
* commit '06cec5f51850898e4a3bd4a164d186c61ba2192e':
  Import translations. DO NOT MERGE
 2015-07-24 04:04:24 +00:00
Nick Kralevich
d9b08e6131 am d517de5a: am a8937f13: am a2adb4c5: am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev 
* commit 'd517de5a83091b6c8138118d1d9f488ee309cde6':
  Revert "UsbDeviceManager: fix b/21429947 regression"
 2015-07-24 04:04:12 +00:00
Svetoslav Ganov
54603af5c2 am d788f405: am 675ecc43: am 5974a7ea: am 492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev 
* commit 'd788f405f1947eff7c54e039d7c625db6a343119':
  Grant record audio to system reco service by default
 2015-07-24 04:04:05 +00:00
Adam Lesinski
4c3d76bca8 am a3bfea87: am f86fb1a4: am 7d8d2865: am f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev 
* commit 'a3bfea879b3ec75d4f3cf461910c00c9c8d48c45':
  UsageStats: Reduce log spam during time change
 2015-07-24 04:03:54 +00:00
Dianne Hackborn
b365dff5c2 am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'bd3d9a0d41f0977b9827c55a98cda3b9e6852b5b':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 04:03:47 +00:00
Adrian Roos
9e80d47039 am 6b32c53b: am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit '6b32c53bcf45239dd5c81d2e48b50e1379294897':
  Fix cut off charging indication in certain scripts
 2015-07-24 04:03:40 +00:00
Dianne Hackborn
556aa7dc8c am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit '00e9e97f7077f1812077a780c1f4fd5d3fa9f288':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 04:03:31 +00:00
Svetoslav Ganov
cec9ac5c8f am 71fa8e19: am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev 
* commit '71fa8e192c1e02f619509135fad8c2ba92871fea':
  Do not show normal permissions in sideloading UI
 2015-07-24 04:03:20 +00:00
Fyodor Kupolov
5fe9b5d4a8 am 142e21b2: am bcf1c522: am c00d2713: am a0a71d8a: Merge "Fixed a typo" into mnc-dev 
* commit '142e21b24c894ae55625592784310cfbed4bb504':
  Fixed a typo
 2015-07-24 04:03:12 +00:00
Adam Lesinski
438fb54a26 am 91211df6: am e63d3144: am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 
* commit '91211df6551d73e18ff195c27dd1e441fc70b86f':
  UsageStats: Gracefully handle corrupt filenames
 2015-07-24 04:03:06 +00:00
Adrian Roos
b6527cd6e8 am 32e8de05: am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '32e8de05fc6b891f99f6e7d893c506fdaeab9dbc':
  Protect demo mode commands with permission
 2015-07-24 04:02:56 +00:00