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

205109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jae Seo
c109f2212b am e47e3b19: am 8d121cf3: am d8162e47: am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'e47e3b19021627e62f017c7b8fcca6d91a1fef18':
  TIF: Enable hardware acceleration on overlay
 2015-07-24 04:02:50 +00:00
Svetoslav Ganov
1298b1a0a2 am 1ad413c0: am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev 
* commit '1ad413c0103df4a35428b13b61477aac17b5eda1':
  Add a privileged permission to get user accounts
 2015-07-24 04:02:42 +00:00
John Reck
27dcd05258 am e8b154a0: am 8fb2a4fa: am 3328fe58: am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 
* commit 'e8b154a05f6dbabbf9478b2fe7ac9cb014886585':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
 2015-07-24 04:02:35 +00:00
Adam Lesinski
a0d43c31df am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '602d71db2e32faf2349d6b4c9a1fe71ba9f27e39':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 04:02:30 +00:00
Nick Kralevich
a508d399e7 am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit '01e00c8ce01c9c9242843b3bc6cec52ad9d89dd2':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-24 04:02:23 +00:00
Chris Wren
3a66153f2a am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit '99547e494a832d2b9d87ce13573150495e6ba3f8':
  Don't crash sysui when advisory calls fail.
 2015-07-24 04:02:17 +00:00
Tim Kilbourn
865ecdb4d2 am d8f08d65: am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit 'd8f08d651f78ca0a66b123ce16250c390c105e07':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-24 04:02:10 +00:00
Alan Viverette
444883e9a1 am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '35b1674a24354421701856a9c7b89abb008c911f':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 04:02:04 +00:00
Fyodor Kupolov
aa32a0b5c6 am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '5192e4b2c05bb684454c5cc0fc8c80c2e7c72f08':
  Added a note about location permission
 2015-07-24 04:01:58 +00:00
xin He
261b694294 am b76cc910: am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit 'b76cc9105d8dd42157f4c32d34d846e7425fa701':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-24 04:01:52 +00:00
Jeff Sharkey
5080e90a62 am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'aebcf3b7efadca1fb5eedbf2cf9f0895d93ba8e8':
  More info to support CTS, fix reconcile bug.
 2015-07-24 04:01:46 +00:00
Jason Monk
bb8b0368c5 am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 04:01:38 +00:00
Jorim Jaggi
b3544372ba am 929a82c8: am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '929a82c81fe778319f04b03e73328724528c8521':
  Partially fix that beginning of animation is skipped
 2015-07-24 04:01:30 +00:00
Dianne Hackborn
1d8b0a29ab am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '14aca8e87a3dc6e8fa783b3c45718a81f9f5e67a':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 04:01:24 +00:00
Deepanshu Gupta
3ca27bd17b am 2df99f99: am 678aef41: am f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev 
* commit '2df99f99e927fed2139fc8f69cbc31b1c8f6766a':
  CalendarView rendering: use R.styleable to find attr.
 2015-07-24 03:38:40 +00:00
Tim Kilbourn
a714a4a770 am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev 
* commit '2f778da1cb88eb9e1f533e63c1f42209cede1f74':
  Add a wm command to dismiss the keyguard.
 2015-07-24 03:38:35 +00:00
Svetoslav Ganov
ce4668b6be am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev 
* commit '3fce45b6610448ac577e49981e1dc0af0f7e6748':
  Reset permissions and app links when clearing app preferences - framework
 2015-07-24 03:38:29 +00:00
Svetoslav Ganov
1c37dc8197 am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit 'dd12420e273b0dfc8f836e1c64562ac2494d7cc1':
  Shut down UiAutomationConnection without a lock held
 2015-07-24 03:38:23 +00:00
Tim Kilbourn
79383d53bc am 1c78d467: am 115189fd: am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev 
* commit '1c78d467881634ca1f2e2c744b648dc6272d5f25':
  Properly synchronize interactivity state.
 2015-07-24 03:38:16 +00:00
Jason Monk
184044e499 am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '42caf39947e9f90834deb1aba251ee45c85d6045':
  Fix emergency only when no sims
 2015-07-24 03:38:09 +00:00
Julia Reynolds
969bc9f7da am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit '0aea721db2663e658b074a8374d8e17f29deb38c':
  Set 'the' media notification to the notification actually playing.
 2015-07-24 03:38:03 +00:00
Jorim Jaggi
dd0b42d42d am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit 'c7dea8b38fd35779776156dd59b1631aca4e02fe':
  Make sure expandingFinished gets called when going into QS
 2015-07-24 03:37:54 +00:00
Wenchao Tong
52dd36cb67 am 1770cb41: am 25975f1b: am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev 
* commit '1770cb419e6a462ec09ebb164d4ac867a4ac4f2b':
  Ignore the active network scorer when checking for idleness
 2015-07-24 03:37:47 +00:00
John Reck
bdb2a90570 am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup 
* commit 'd08fb6878f0f8fdf7a527384028359c7fcf991da':
  Fix a race condition that could cause lockup
 2015-07-24 03:37:38 +00:00