Rihanna's partner A$AP Rocky has been charged with assault with a firearm.
The US rapper, whose real name is Rakim Mayers, is alleged to have pointed a handgun at a victim believed to be a former friend in November last year.
The Los Angeles County District Attorney's office has charged Mayers with two counts of assault with a semi-automatic firearm.
He is also alleged to have fired the weapon in the direction of the victim in a subsequent confrontation.
"Discharging a gun in a public place is a serious offence that could have ended with tragic consequences not only for the person targeted but also for innocent bystanders visiting Hollywood," district attorney George Gascon said.
"My office conducted a thorough review of the evidence in this case and determined that the addition of a special firearm allegation was warranted."
Mayers is due to enter a plea to the charge on Wednesday (local time) in Los Angeles.
The case remains under investigation by the robbery and homicide division of the Los Angeles Police Department.